行业贡献率

jinpengyong

2021-12-27 c363540ce0469e6754329c1be5e56a63ec1d344f

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

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

        //用户in西
        //用户信息
        userInfo.put("userId", userBo.getId());
        userInfo.put("account", userBo.getAccount());
        userInfo.put("userName", userBo.getUserName());
@@ -219,6 +219,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) {
@@ -342,7 +343,6 @@
        /*String account = beforeUser.getAccount();
        //account不可修改
        user.setAccount(account);*/
        System.out.println(user);
        if (!ObjectUtils.isEmpty(user.getAccount())) {
            QueryWrapper<User> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount());
@@ -361,7 +361,6 @@
        }
        //密码校验
        String password = user.getPassword();
        System.out.println("password==" + password);
        if (!ObjectUtils.isEmpty(password)) {
            //密码解密
            password = AESUtils.decrypt(password, AESKey);
@@ -390,13 +389,9 @@
        Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        if (userExpireTime != null) {
            if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
                user.setExpireTime(orgExpireTime);
            } else {
                user.setExpireTime(userExpireTime);
            }
        } else {
            if (orgExpireTime != null) {
                user.setExpireTime(orgExpireTime);
                result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode());
                result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg());
                return result;
            }
        }
        //更新redis
@@ -408,7 +403,8 @@
        userMapper.updateById(user);

        //日志
        StringBuilder content = new StringBuilder("修改了用户：" + user.getAccount() + "->");
        String account = userMapper.selectById(userId).getAccount();
        StringBuilder content = new StringBuilder("修改了用户：" + account + "->");
        for (String key : update.keySet()) {
            Object afterValue = update.get(key);
            if (!key.equals("id") && afterValue != null) {
@@ -417,7 +413,6 @@
                content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
            }
        }
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
        return result;
    }