fix：用户登陆鉴权，组织机构关联处理

project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java

@@ -102,6 +102,11 @@ public enum StatusCodeEnum {
      */
      */
     RESOURCE_ALREADY_EXISTS_ROLE("017","角色中已存在该资源,不能重复添加", false),
     RESOURCE_ALREADY_EXISTS_ROLE("017","角色中已存在该资源,不能重复添加", false),
 
 
+    /**
+     * 用户状态异常或已被禁用
+     */
+    USER_ISBAN_OR_ERROR("018","用户状态异常或已被禁用", false),
+
     GIS_EXISTS("001", "已存在", false),
     GIS_EXISTS("001", "已存在", false),
 
 
     GIS_NOT_EXISTS("002", "不存在", false),
     GIS_NOT_EXISTS("002", "不存在", false),

project-interface/src/main/java/com/dituhui/pea/pojo/UserInfo.java

@@ -86,7 +86,7 @@ public class UserInfo {
     /**
     /**
      * 组织ids
      * 组织ids
      */
      */
-    private List<Integer> orgIds;
+    private List<String> orgIds;
     /**
     /**
      * 组织级别 0：大区 1：分部  2：站点
      * 组织级别 0：大区 1：分部  2：站点
      */
      */

project-interface/src/main/java/com/dituhui/pea/pojo/user/OrgInfo.java

@@ -10,7 +10,7 @@ public class OrgInfo implements Serializable {
     /**
     /**
      * 机构id
      * 机构id
      */
      */
-    private Integer id;
+    private String id;
 
 
     /**
     /**
      * 机构名称
      * 机构名称

project-user/src/main/java/com/dituhui/pea/user/entity/UserOrgEntity.java

@@ -20,7 +20,7 @@ public class UserOrgEntity {
     private String userId;
     private String userId;
 
 
     @Column(name = "org_id", nullable = false)
     @Column(name = "org_id", nullable = false)
-    private Integer orgId;
+    private String orgId;
 
 
     /**
     /**
      * 组织级别 0：大区 1：分部  2：站点
      * 组织级别 0：大区 1：分部  2：站点

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -102,7 +102,13 @@ public class UserService {
     public Result<UserLoginDTO> userLogin(String account, String password) {
     public Result<UserLoginDTO> userLogin(String account, String password) {
         UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
         UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
         log.info("{}/{} login", account, password);
         log.info("{}/{} login", account, password);
-        if (null != user) {
+        if (null == user) {
+            return Result.failure("鉴权失败");
+        }
+        //判断用户禁用/异常情况
+        if (user.getBan() == 1 || user.getStatus() == 0) {
+            Result.failed(StatusCodeEnum.USER_ISBAN_OR_ERROR, null);
+        }
         UserLoginDTO userDTO = convertToUserLoginDTO(user);
         UserLoginDTO userDTO = convertToUserLoginDTO(user);
         // 生成token
         // 生成token
         String token = IdUtil.simpleUUID();
         String token = IdUtil.simpleUUID();
@@ -110,9 +116,6 @@ public class UserService {
         long timestamp = System.currentTimeMillis() + LIVE_TIME_MILLIS;
         long timestamp = System.currentTimeMillis() + LIVE_TIME_MILLIS;
         redisService.set(RedisKeyGroup.authToken + ":" + token, gson.toJson(userDTO), timestamp / 1000);
         redisService.set(RedisKeyGroup.authToken + ":" + token, gson.toJson(userDTO), timestamp / 1000);
         return Result.success(userDTO);
         return Result.success(userDTO);
-        } else {
-            return Result.failure("鉴权失败");
-        }
     }
     }
 
 
     private UserLoginDTO convertToUserLoginDTO(UserEntity user) {
     private UserLoginDTO convertToUserLoginDTO(UserEntity user) {
@@ -482,7 +485,7 @@ public class UserService {
         //处理用户机构关联信息
         //处理用户机构关联信息
         if (CollectionUtils.isNotEmpty(userInfo.getOrgIds()) && null != userInfo.getOrgIds()) {
         if (CollectionUtils.isNotEmpty(userInfo.getOrgIds()) && null != userInfo.getOrgIds()) {
             userOrgDao.deleteByUserId(userInfo.getId());
             userOrgDao.deleteByUserId(userInfo.getId());
-            for (Integer orgId : userInfo.getOrgIds()) {
+            for (String orgId : userInfo.getOrgIds()) {
                 UserOrgEntity userOrgEntity = new UserOrgEntity();
                 UserOrgEntity userOrgEntity = new UserOrgEntity();
                 userOrgEntity.setUserId(userInfo.getId());
                 userOrgEntity.setUserId(userInfo.getId());
                 userOrgEntity.setOrgId(orgId);
                 userOrgEntity.setOrgId(orgId);