he2802 há 1 ano atrás
pai
commit
fbc003cf3d

+ 2 - 2
zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -54,9 +54,9 @@ public class CustomTenantLineHandler implements TenantLineHandler {
     @SneakyThrows
     @Override
     public Expression getTenantId() {
-        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        String TenantId = ServletUtils.getResponse().getHeader("TenantId");
         if(Validator.isEmpty(TenantId)){
-            TenantId = ServletUtils.getResponse().getHeader("TenantId");
+            TenantId = ServletUtils.getRequest().getHeader("TenantId");
             if(enabledTenant){
                 if(Validator.isEmpty(TenantId)){
                     int code = HttpStatus.HTTP_UNAVAILABLE;

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

@@ -1095,6 +1095,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 = "施工继教";
         SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUserName, userName).last("limit 1"));

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -239,4 +239,5 @@ public class ClassPeriodStudentVo {
 	private Long cheat;
 	@ApiModelProperty("試卷作弊节")
 	private Long examCheat;
+	private String tenantId;
 }