Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -102,4 +102,8 @@ public class LoginResVo1 implements Serializable {
      */
     private String token;
 
+    private Long deptId;
+
+    private Long roleId;
+
 }

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -448,6 +448,8 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setClientType(loginBase.getClientType());
         loginRes.setSystemType(loginBase.getSystemType());
         loginRes.setToken(token);
+        loginRes.setDeptId(user.getDeptId());
+        loginRes.setRoleId(user.getRoleId());
         return HttpResult.ok(loginRes);
     }
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -120,7 +120,7 @@ public class RequestCheckFilter implements Filter {
             return;
         } else {
             //校验用户企业是否冻结
-            if (loginEntInfo.getStatus()  == Global.YES) {
+            if (!SystemTypeEnum.MANAGE.getCode().equals(Integer.parseInt(systemType)) && loginEntInfo.getStatus()  == Global.YES) {
                 ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, "您所属企业已被冻结，请联系系统管理员！"));
                 return;
             }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsUserResDto.java

@@ -1,5 +1,7 @@
 package com.sckw.system.api.model.dto.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
 
 import java.io.Serial;
@@ -111,4 +113,16 @@ public class KwsUserResDto implements Serializable {
      */
     private Long entId;
 
+    /**
+     * 机构id
+     */
+    @JsonSerialize(using = LongToStringUtils.class)
+    private Long deptId;
+
+    /**
+     * 角色id
+     */
+    @JsonSerialize(using = LongToStringUtils.class)
+    private Long roleId;
+
 }