fix

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -428,9 +428,9 @@ public class ToolsUtils {
     }
 
     public static String getTenantId() {
-        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        String TenantId =  ServletUtils.getResponse().getHeader("TenantId");
         if(!StrUtil.isNotBlank(TenantId)||TenantId==null){
-            TenantId = ServletUtils.getResponse().getHeader("TenantId");
+            TenantId = ServletUtils.getRequest().getHeader("TenantId");
         }
         if(Validator.isNotEmpty(TenantId)){
             if(TenantId.equals("undefined")){

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

@@ -943,10 +943,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (!DateUtils.dateTimeNow(DateUtils.YYYYMMDD).equals(datetimeStr)) {
             throw new CustomException("数据错误");
         }
-        User user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, EncryptHandler.encrypt(idCard)).last("limit 1"));
+        User user = iUserService.getByCardNoTenant(idCard);
         if (Validator.isEmpty(user)) {
             throw new CustomException("身份证查无用户");
         }
+        if(Validator.isNotEmpty(user.getTenantId())){
+            ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", user.getTenantId().toString());
+        }
         String bh = split.get("bh");
         List<ClassGrade> classGradeList = iClassGradeService.list(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getOfficialName, bh));
         if (Validator.isEmpty(classGradeList) || classGradeList.size() == 0) {
@@ -984,6 +987,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         studentVo.setGoodsName(goods.getGoodsName());
         studentVo.setFullName(fullName);
         studentVo.setOrderGoodsId(orderGoods.getOrderGoodsId());
+        studentVo.setTenantId(user.getTenantId().toString());
         String userName = "erjian";
         if(fullName.equals("继续教育二级建造师")){
             studentVo.setGradeType(1);