submit

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

@@ -1291,11 +1291,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         String SEVEN_OFFICIALPUSH_INFOACCOUNT=null;
         String SEVEN_OFFICIALPUSH_TOKEN=null;
         String pars;
-        Boolean flag = false;
+//        Boolean flag = false;
         try {
             if(Validator.isNotEmpty(bo.getTenantId())){
-                SysTenant tenant = iSysTenantService.getById(bo.getTenantId());
-                flag = tenant.getShareClass() == 1;
+//                SysTenant tenant = iSysTenantService.getById(bo.getTenantId());
+//                flag = tenant.getShareClass() == 1;
                 ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", bo.getTenantId());
             }
             if(Validator.isNotEmpty(configService.selectConfigByKeyNoCache("seven.office.account"))){
@@ -1331,12 +1331,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
         String bh = split.get("bh");
         log.info("学时抽查"+ idCard+"RR"+datetime+"RR"+year);
-        User user;
-        if (flag){
-            user = iUserService.getByCardNoTenantNew(idCard,bh);
-        }else {
-            user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard,EncryptHandler.encrypt(idCard)).last("limit 1"));
-        }
+//        User user;
+//        if (flag){
+//            user = iUserService.getByCardNoTenantNew(idCard,bh);
+//        }else {
+//            user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard,EncryptHandler.encrypt(idCard)).last("limit 1"));
+//        }
+        User user = iUserService.getByCardNoTenantNew(idCard,bh);
         if (Validator.isEmpty(user)) {
             throw new CustomException("身份证查无用户");
         }