tanzh 3 年 前
コミット
99f68f7a66

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -913,7 +913,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()).get(0));
             }
 
-            if(Validator.isNotEmpty(bo.getUserPhoto())&&bo.getUserPhoto()==1){
+            //当审核状态状态为通过是采取解析身份证和一寸照
+            if("1".equals(classPeriodStudentVo.getProfileStatus()) && Validator.isNotEmpty(bo.getUserPhoto())&&bo.getUserPhoto()==1){
                 //解析身份证和一寸照
                 if(Validator.isNotEmpty(classPeriodStudentVo.getKeyValue())){
                     JSONObject keyJSON = null;

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

@@ -377,7 +377,7 @@
             and cgu.period_status != -1
         </if>
         <if test="searchKey != null and searchKey != '' ">
-            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or g.goods_name like concat('%', #{searchKey}, '%') or g.code like concat('%', #{searchKey}, '%'))
+            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or g.goods_name like concat('%', #{searchKey}, '%') or cg.class_name like concat('%', #{searchKey}, '%'))
         </if>
         <if test="searchStartTime != null and searchStartTime !='' ">
             AND cgu.create_time >=#{searchStartTime}