Merge remote-tracking branch 'origin/wb' into cjl

cjl

2023-10-20 c7dd4a195d8d893d92c49963447cdf6486844584

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -80,6 +80,9 @@
    @Autowired
    private OperationLogUtils operationLogUtils;

    @Autowired
    private ResponsibilityUnitMapper responsibilityUnitMapper;


    @Value("${AES.KEY}")
    private String AESKey;
@@ -120,6 +123,7 @@
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
            return result;
        }
        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();
        userInfo.put("userId", userBo.getId());
@@ -128,6 +132,7 @@
        userInfo.put("email", userBo.getEmail());
        userInfo.put("mobile", userBo.getMobile());
        userInfo.put("unitId",userBo.getUnitId());
        userInfo.put("unName",responsibilityUnit.getAreaName());
        userInfo.put("wechat", userBo.getWechat());
        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
        userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -184,9 +189,10 @@
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
            return result;
        }

        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();

        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
        //用户信息
        userInfo.put("userId", userBo.getId());
        userInfo.put("account", userBo.getAccount());
@@ -194,6 +200,7 @@
        userInfo.put("email", userBo.getEmail());
        userInfo.put("mobile", userBo.getMobile());
        userInfo.put("unitId",userBo.getUnitId());
        userInfo.put("unName",responsibilityUnit.getAreaName());
        userInfo.put("wechat", userBo.getWechat());
        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
        userInfo.put("isAdmin", userBo.getIsAdmin());