From f596b8eab5e30c963808ea6f229111551604b1b4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:40:35 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index ae847c4..569562c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -30,14 +30,17 @@
import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.entity.UserLog;
import com.moral.api.mapper.MenuMapper;
+import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserLogMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
@@ -76,6 +79,9 @@
@Autowired
private OperationLogUtils operationLogUtils;
+
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
@Value("${AES.KEY}")
private String AESKey;
@@ -119,12 +125,13 @@
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
- //������in���
+ //������������
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("unitId",userBo.getUnitId());
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -219,6 +226,7 @@
//������������������������������
List<Menu> nextLevelMenus = menus.stream()
.filter(o -> o.getParentId().equals(menu.getId()))
+ .sorted(Comparator.comparing(Menu::getOrder))
.collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
if (nextLevelMenus.size() > 0) {
@@ -280,6 +288,8 @@
result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
return result;
}
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());
+ user.setUnitId(responsibilityUnit.getUnitId());
//������������
user.setPassword(MD5Utils.saltMD5(password));
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -399,6 +409,8 @@
String deleteToken = TokenUtils.hget(userId).toString();
TokenUtils.destoryToken(userId, deleteToken);
}
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());
+ user.setUnitId(responsibilityUnit.getUnitId());
userMapper.updateById(user);
//������
--
Gitblit v1.8.0