fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -212,10 +212,6 @@ public class ClassGradeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('grade:grade:list')")
     @GetMapping("/listGradeAll")
     public TableDataInfo<ClassGradeStudentVo> listGradeAll(ClassGradeUserQueryBo bo) {
-        ClassGrade gradeGrade = iClassGradeService.getById(bo.getGradeId());
-        if (StringUtils.isNotBlank(gradeGrade.getSevenCode())){
-            bo.setSevenCode(gradeGrade.getSevenCode());
-        }
         startPage();
         List<ClassGradeStudentVo> list = iClassGradeService.listGradeAll(bo);
         return getDataTable(list);

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

@@ -314,4 +314,5 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 	@ApiModelProperty("录单订单编号")
 	private String inputOrderSn;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -658,15 +658,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="officialStatus != null and officialStatus == 0 ">
             AND (cgu.official_status is NULL or cgu.official_status=0)
         </if>
-        <if test="realname != null and realname != ''">
-            AND u.realname like concat('%', #{realname}, '%')
+        <if test="searchKey != null and searchKey != ''">
+            AND (cg.class_name like concat('%', #{searchKey}, '%') or u.realname like concat('%', #{searchKey}, '%') or u.company_name like concat('%', #{searchKey}, '%'))
         </if>
         <if test="telphone != null and telphone != ''">
             AND (u.telphone like concat('%', #{telphone,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%'))
         </if>
-        <if test="companyName != null and companyName != ''">
-            AND u.company_name like concat('%', #{companyName}, '%')
-        </if>
         <if test="idCard != null and idCard != ''">
             AND u.id_card like concat('%', #{idCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
         </if>
@@ -715,19 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="hasInterface != null and hasInterface == 2">
             AND cg.no_interface_account_id is not null
         </if>
-        <if test="hasBindWx != null and hasBindWx == 1 ">
-            AND u.union_id is not null
-        </if>
-        <if test="hasBindWx != null and hasBindWx == 0 ">
-            AND u.union_id is null
-        </if>
-        <if test="hasFollowWx != null and hasFollowWx == 1 ">
-            AND uwf.gzh_open_id is not null
-        </if>
-        <if test="hasFollowWx != null and hasFollowWx == 0 ">
-            AND uwf.gzh_open_id is null
-        </if>
-        order by user_info_status desc ,user_status desc ,cgu.id desc
+        order by cgu.id desc
     </select>
 
     <select id="listGradeInform" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeUserListVo">