Compare commits

..

No commits in common. "19a5efa66edf8b8696aeaa18c7a9a71475848b9e" and "72a2bfd8f749b733eaa5ce5fe16df48d403b297e" have entirely different histories.

2 changed files with 37 additions and 37 deletions

View File

@ -491,7 +491,7 @@ public class AndroidMeetingController {
List<AiModelVO> enabledModels = modelList.getRecords() == null List<AiModelVO> enabledModels = modelList.getRecords() == null
? List.of() ? List.of()
: modelList.getRecords().stream() : modelList.getRecords().stream()
.filter(item -> Integer.valueOf(1).equals(item.getStatus()) && Integer.valueOf(1).equals(item.getTenantEnabled())) .filter(item -> Integer.valueOf(1).equals(item.getStatus()))
.toList(); .toList();
resultVo.setModelsList(enabledModels); resultVo.setModelsList(enabledModels);
resultVo.setHotWordGroupList(hotWordGroupService.listVisibleOptions(tenantId)); resultVo.setHotWordGroupList(hotWordGroupService.listVisibleOptions(tenantId));

View File

@ -422,15 +422,15 @@ const SpeakerReg: React.FC = () => {
const renderRecordingArea = (isMyVoice: boolean) => ( const renderRecordingArea = (isMyVoice: boolean) => (
<div className="modern-recording-container"> <div className="modern-recording-container">
{/* Only show back button if the user ALREADY has a voiceprint and is just updating it */} {/* Only show back button if the user ALREADY has a voiceprint and is just updating it */}
{(isMyVoice ? mySpeaker : editingSpeaker) && (isMyVoice ? {(isMyVoice ? mySpeaker : editingSpeaker) && (
<div className="back-nav"> <div className="back-nav">
<Button type="text" className="back-btn" icon={<ArrowLeftOutlined />} onClick={() => { <Button type="text" className="back-btn" icon={<ArrowLeftOutlined />} onClick={() => {
if (isMyVoice) setMyViewMode("view"); if (isMyVoice) setMyViewMode("view");
else setIsAddModalVisible(false); else setIsAddModalVisible(false);
}}> }}>
{isMyVoice ? '我的声纹' : '列表'}
</Button> </Button>
</div> : '' </div>
)} )}
{!isMyVoice && ( {!isMyVoice && (
@ -721,39 +721,39 @@ const SpeakerReg: React.FC = () => {
bodyDensity="default" bodyDensity="default"
> >
<div className="others-drawer-content"> <div className="others-drawer-content">
{/*{editingSpeaker ? (*/} {editingSpeaker ? (
{/* <Form form={form} layout="vertical" initialValues={{ name: editingSpeaker.name, remark: editingSpeaker.remark }}>*/} <Form form={form} layout="vertical" initialValues={{ name: editingSpeaker.name, remark: editingSpeaker.remark }}>
{/* <Form.Item label="姓名" name="name" rules={[{ required: true, message: "请输入姓名" }]}>*/} <Form.Item label="姓名" name="name" rules={[{ required: true, message: "请输入姓名" }]}>
{/* <Input placeholder="请输入姓名" />*/} <Input placeholder="请输入姓名" />
{/* </Form.Item>*/} </Form.Item>
{/* <Form.Item label="备注 (可选)" name="remark">*/} <Form.Item label="备注 (可选)" name="remark">
{/* <Input.TextArea placeholder="请输入备注" />*/} <Input.TextArea placeholder="请输入备注" />
{/* </Form.Item>*/} </Form.Item>
{/* </Form>*/} </Form>
{/*) : (*/} ) : (
{/* <Form form={form} layout="vertical" initialValues={{ userId: undefined }}>*/} <Form form={form} layout="vertical" initialValues={{ userId: undefined }}>
{/* /!*<Form.Item label="选择系统用户" name="userId" rules={[{ required: true, message: "请选择用户" }]}>*!/*/} <Form.Item label="选择系统用户" name="userId" rules={[{ required: true, message: "请选择用户" }]}>
{/* /!* <Select*!/*/} <Select
{/* /!* showSearch*!/*/} showSearch
{/* /!* placeholder="搜索姓名或手机号"*!/*/} placeholder="搜索姓名或手机号"
{/* /!* optionFilterProp="children"*!/*/} optionFilterProp="children"
{/* /!* options={userOptions.map((u) => ({*!/*/} options={userOptions.map((u) => ({
{/* /!* label: `${u.displayName || u.username} ${u.phone ? `(${u.phone})` : ""}`,*!/*/} label: `${u.displayName || u.username} ${u.phone ? `(${u.phone})` : ""}`,
{/* /!* value: u.userId,*!/*/} value: u.userId,
{/* /!* }))}*!/*/} }))}
{/* /!* onChange={(val) => {*!/*/} onChange={(val) => {
{/* /!* const user = userOptions.find((u) => u.userId === val);*!/*/} const user = userOptions.find((u) => u.userId === val);
{/* /!* if (user) {*!/*/} if (user) {
{/* /!* form.setFieldValue("name", user.displayName || user.username);*!/*/} form.setFieldValue("name", user.displayName || user.username);
{/* /!* }*!/*/} }
{/* /!* }}*!/*/} }}
{/* /!* />*!/*/} />
{/* /!*</Form.Item>*!/*/} </Form.Item>
{/* <Form.Item name="name" hidden>*/} <Form.Item name="name" hidden>
{/* <Input />*/} <Input />
{/* </Form.Item>*/} </Form.Item>
{/* </Form>*/} </Form>
{/*)}*/} )}
<div className="drawer-record-area"> <div className="drawer-record-area">
{renderRecordingArea(false)} {renderRecordingArea(false)}