Selaa lähdekoodia

酷乐秀曲目来源改为内容平台

zouxuan 1 vuosi sitten
vanhempi
commit
e88bb0a83d

+ 3 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAuthRecordMapper.xml

@@ -56,10 +56,11 @@
             su.del_flag_ = 0 AND
             ms.source_type_  = 'TEACHER'
             <if test="param.idAndName != null and param.idAndName != ''">
-                and (su.id_ like concat('%',#{param.idAndName} ,'%')
+                and ((su.id_ like concat('%',#{param.idAndName} ,'%')
                 or su.username_ like concat('%',#{param.idAndName},'%')
                 or ms.music_sheet_name_ like concat('%',#{param.idAndName},'%')
-                or su.phone_ like concat('%',#{param.idAndName},'%'))
+                or su.phone_ like concat('%',#{param.idAndName},'%')) AND msar.audit_state_ = 'PASS') OR
+                (JSON_UNQUOTE(JSON_EXTRACT(music_sheet_json_, '$.name')) LIKE CONCAT('%',#{param.idAndName},'%' AND msar.audit_state_ != 'PASS'))
             </if>
             <if test="param.auditName != null and param.auditName != ''">
                 and su2.username_ like concat('%',#{param.auditName},'%')

+ 5 - 3
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -165,9 +165,11 @@
             and t.music_sheet_type_ = #{param.musicSheetType}
         </if>
         <if test="param.idAndName != null and param.idAndName != ''">
-            and (t.id_ like concat('%',#{param.idAndName},'%') or
-            t.music_sheet_name_ like concat('%',#{param.idAndName},'%') or
-            t.composer_ like concat ('%',#{param.idAndName},'%'))
+            and ((su.id_ like concat('%',#{param.idAndName} ,'%')
+            or su.username_ like concat('%',#{param.idAndName},'%')
+            or ms.music_sheet_name_ like concat('%',#{param.idAndName},'%')
+            or su.phone_ like concat('%',#{param.idAndName},'%')) AND msar.audit_state_ = 'PASS') OR
+            (JSON_UNQUOTE(JSON_EXTRACT(music_sheet_json_, '$.name')) LIKE CONCAT('%',#{param.idAndName},'%' AND msar.audit_state_ != 'PASS'))
         </if>
         <if test="param.search != null and param.search != ''">
             and (t.cbs_music_sheet_id_ like concat('%',#{param.search},'%') or