bug修改

2796 进行相同人物审核时，库中已有人物应该都带有编码
多标签查询

src/main/java/com/zzsn/leaderbase/mapper/CharacterBasicInfoMapper.java

@@ -59,7 +59,8 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
             "and b.check_result = 1 " +
             "and a.name = #{name} " +
             "and a.id != #{id} " +
-            "and b.article_id != #{articleId}")
+            "and b.article_id != #{articleId} " +
+            "and a.uid IS NOT NULL")
     List<CharacterVo> getListByName(String id, String name, String articleId);
 
     @Select("select count(1) " +

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -28,9 +28,7 @@
             AND a.name like '%${name}%'
         </if>
         <if test="company != null and company != ''">
-            <foreach item="item" index="index" collection="company" open="AND d.tag_name like '%" separator="," close="%' ">
-                ${item}
-            </foreach>
+            AND b.company like '%${company}%'
         </if>
         <if test="duty != null and duty != ''">
             AND b.duty like '%${duty}%'
@@ -48,7 +46,9 @@
             AND b.type_id = #{typeId}
         </if>
         <if test="tagName != null and tagName != ''">
-            AND d.tag_name like '%${tagName}%'
+            <foreach item="item" index="index" collection="tagName.split(',')">
+                AND d.tag_name like '%${item}%'
+            </foreach>
         </if>
     )t1
         <if test="order != null and order != ''">
@@ -79,9 +79,7 @@
             AND a.name like '%${name}%'
         </if>
         <if test="company != null and company != ''">
-            <foreach item="item" index="index" collection="company" open="AND d.tag_name like '%" separator="," close="%' ">
-                ${item}
-            </foreach>
+            AND b.company like '%${company}%'
         </if>
         <if test="duty != null and duty != ''">
             AND b.duty like '%${duty}%'
@@ -99,9 +97,10 @@
             AND b.type_id = #{typeId}
         </if>
         <if test="tagName != null and tagName != ''">
-            AND d.tag_name like '%${tagName}%'
+            <foreach item="item" index="index" collection="tagName.split(',')">
+                AND d.tag_name like '%${item}%'
+            </foreach>
         </if>
-
     </select>