chenh
/
imeeting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenh:19a5efa66edf8b8696aeaa18c7a9a71475848b9e
Branches Tags
chenh:dev_na
chenh:fix_0727
chenh:master
..
compare: chenh:72a2bfd8f749b733eaa5ce5fe16df48d403b297e
Branches Tags
chenh:dev_na
chenh:fix_0727
chenh:master

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

2 changed files with 37 additions and 37 deletions
Show Stats Expand all files Collapse all files

2
backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java
View File

@ -491,7 +491,7 @@ public class AndroidMeetingController {
List<AiModelVO> enabledModels = modelList.getRecords() == null
? List.of()
: 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();
resultVo.setModelsList(enabledModels);
resultVo.setHotWordGroupList(hotWordGroupService.listVisibleOptions(tenantId));

72
frontend/src/pages/business/SpeakerReg.tsx
View File

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