Merge branch 'fix_0727' into dev_na

backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java

@@ -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()))
+          .filter(item -> Integer.valueOf(1).equals(item.getStatus()) && Integer.valueOf(1).equals(item.getTenantEnabled()))
                   .toList();
         resultVo.setModelsList(enabledModels);
       resultVo.setHotWordGroupList(hotWordGroupService.listVisibleOptions(tenantId));

frontend/src/pages/business/SpeakerReg.tsx

@@ -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 ? mySpeaker : editingSpeaker) && (isMyVoice ?
         <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)}