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

Merge branch 'fix_0727' into dev_na

dev_na
chenhao 2026-08-11 09:18:00 +08:00
parent 72a2bfd8f7 d5e1616c01
commit 19a5efa66e
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File 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<AiModelVO> enabledModels = modelList.getRecords() == null
? List.of() ? List.of()
: modelList.getRecords().stream() : modelList.getRecords().stream()
.filter(item -> Integer.valueOf(1).equals(item.getStatus())) .filter(item -> Integer.valueOf(1).equals(item.getStatus()) && Integer.valueOf(1).equals(item.getTenantEnabled()))
.toList(); .toList();
resultVo.setModelsList(enabledModels); resultVo.setModelsList(enabledModels);
resultVo.setHotWordGroupList(hotWordGroupService.listVisibleOptions(tenantId)); 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) => ( 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 ? mySpeaker : editingSpeaker) && (isMyVoice ?
<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)}