he2802 2 years ago
parent
commit
cb3f2b9f60

+ 0 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -309,5 +309,4 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 
 
 
 
 
-
 }
 }

+ 5 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -531,7 +531,11 @@
             and (u.realname like concat('%', #{searchKey}, '%')
             and (u.realname like concat('%', #{searchKey}, '%')
                 or u.id_card like concat('%', #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
                 or u.id_card like concat('%', #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
                 or g.goods_name like concat('%', #{searchKey}, '%')
                 or g.goods_name like concat('%', #{searchKey}, '%')
-                or cg.class_name like concat('%', #{searchKey}, '%'))
+                or cg.class_name like concat('%', #{searchKey}, '%')
+                or u.company_name like concat('%', #{searchKey}, '%'))
+        </if>
+        <if test="companyName != null and companyName != '' ">
+            and u.company_name like concat('%', #{companyName}, '%')
         </if>
         </if>
         <if test="idCard != null and idCard !='' ">
         <if test="idCard != null and idCard !='' ">
             AND u.id_card = #{idCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
             AND u.id_card = #{idCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}