blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2023-09-27 68e22957db996437fa20a9a4aa5ff37c54d4056f 
 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,7 @@




    @Autowired


    private OperationLogUtils operationLogUtils;






    @Value("${AES.KEY}")


    private String AESKey;


@@ -119,12 +123,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 +224,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) {