Merge branch 'dev'

# Conflicts:
#	zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

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

@@ -1199,14 +1199,14 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             byte[] rgbKey = OFFICIALPUSH_TOKEN.substring(0, 8).getBytes("UTF-8");
             pars = ToolsUtils.decryptDesNew(bo.getData(), OFFICIALPUSH_TOKEN.substring(0, 8));
         } catch (Exception e) {
-            throw new CustomException("解析错误");
+            throw new CustomException("解析错误",507);
         }
         log.info("学时抽查pars："+pars);
         Map<String, String> split = Splitter.on("&").withKeyValueSeparator("=").split(pars);
         String idCard = split.get("idnum");
         String datetime = split.get("datetime");
         if (Validator.isEmpty(datetime)) {
-            throw new CustomException("数据错误");
+            throw new CustomException("数据错误",507);
         }
         if(Validator.isNotEmpty(idCard)){
             idCard = idCard.trim();
@@ -1223,7 +1223,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 //        User user = iUserService.getByCardNoTenant(idCard);
         User user = iUserService.getByCardNoTenantNew(idCard,bh);
         if (Validator.isEmpty(user)) {
-            throw new CustomException("身份证查无用户");
+            throw new CustomException("身份证查无用户",507);
         }
         if(Validator.isNotEmpty(user.getTenantId())){
             ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", user.getTenantId().toString());
@@ -1231,7 +1231,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
         List<ClassGrade> classGradeList = iClassGradeService.list(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getOfficialName, bh));
         if (Validator.isEmpty(classGradeList) || classGradeList.size() == 0) {
-            throw new CustomException("班级不存在");
+            throw new CustomException("班级不存在",507);
         }
         ClassGradeUser classGradeUser = null;
         ClassGrade grade = null;
@@ -1248,11 +1248,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
         }
         if (Validator.isEmpty(classGradeUser)) {
-            throw new CustomException("班级用户不存在");
+            throw new CustomException("班级用户不存在",507);
         }
         OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId, classGradeUser.getOrderGoodsId()));
         if (Validator.isEmpty(orderGoods)) {
-            throw new CustomException("订单商品不存在");
+            throw new CustomException("订单商品不存在",507);
         }
         Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId, orderGoods.getGoodsId()));
         CourseBusinessQueryBo queryBo = new CourseBusinessQueryBo();
@@ -1286,7 +1286,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUserName, userName).last("limit 1"));
         if(Validator.isEmpty(sysUser)){
-            throw new CustomException("未创建监管账号");
+            throw new CustomException("未创建监管账号",507);
         }
         LoginUser loginUser = new LoginUser();
         loginUser.setUser(sysUser);