submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -822,7 +822,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(bo.getPwd()==null){
             throw new CustomException("密码不能为空");
         }
-        if(!ToolsUtils.verifEasyPwd(bo.getPwd())){
+        if(!ToolsUtils.verifPwd(bo.getPwd())){
             throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
         }
         String key = Constants.REGISTER_SMS + bo.getTel();

zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/impl/FaceOcrServiceImpl.java

@@ -331,6 +331,8 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
             if(Validator.isEmpty(bo.getUrlA())||Validator.isEmpty(bo.getOneInchPhotos())){
                 throw new CustomException("参数错误");
             }
+            log.error("身份证照片路径:"+bo.getUrlA());
+            log.error("一寸照片:"+bo.getOneInchPhotos());
             String oneInchPhotos =bo.getOneInchPhotos();
             Credential cred = new Credential(SecretId, SecretKey);
             ClientProfile clientProfile = new ClientProfile();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1684,7 +1684,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 case 1://审核通过
                     List<String> userNames = new ArrayList<>();
                     topOldOrderGoods.forEach(item -> {
-                        User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
+                        User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()).eq(User::getTenantId,"867735392558919680"));
                         userNames.add(user.getRealname());
                         if (ObjectUtil.isNull(user)) {
                             return;
@@ -1712,7 +1712,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     break;
                 case 2: //审核未通过
                     topOldOrderGoods.forEach(item -> {
-                        User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
+                        User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()).eq(User::getTenantId,"867735392558919680"));
                         if (ObjectUtil.isNull(user)) {
                             return;
                         }

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

@@ -1144,8 +1144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         class_grade_user cgu  LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
         WHERE
         1 = 1
+        AND cgu.`status` = 1
+        AND cb.`period_check_sign` = 1
         <if test="periodStatus != null">
             AND cgu.period_status = 1
         </if>
@@ -1764,4 +1767,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * from class_grade where grade_id = #{gradeId}
     </select>
 
+
 </mapper>