smartor代码库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liusheng
17 小时以前 15fad6a0122b0757399885c4232056da64996013 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java


@@ -20,12 +20,13 @@


import com.ruoyi.system.service.ISysPostService;


import com.ruoyi.system.service.ISysRoleService;


import com.ruoyi.system.service.ISysUserService;


import com.smartor.mapper.SysUserDeptMapper;


import com.ruoyi.system.mapper.SysUserDeptMapper;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.apache.commons.lang3.ArrayUtils;


import org.apache.commons.lang3.ObjectUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Qualifier;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


@@ -60,6 +61,7 @@


    private ISysPostService postService;




    @Autowired


    @Qualifier("sysUserDeptSystemMapper")


    private SysUserDeptMapper sysUserDeptMapper;




    @Value("${isAdmin}")


@@ -125,7 +127,16 @@


        log.info("--------userId的值为：{}", userId);


        userService.checkUserDataScope(userId);


        AjaxResult ajax = AjaxResult.success();


        List<SysRole> roles = roleService.selectRoleAll();




        LoginUser loginUser = getLoginUser();


        SysUser user = loginUser.getUser();


        log.info("--------user的值为：{}", user);




        SysRole roleVo = new SysRole();


        roleVo.setOrgid(user.getOrgid());


        List<SysRole> roles = roleService.selectRoleList(roleVo);


        log.info("--------roles的值为：{}", roles);




        ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));


        ajax.put("posts", postService.selectPostAll());


        if (StringUtils.isNotNull(userId)) {


@@ -139,9 +150,7 @@


        SysUserDept sysUserDept = new SysUserDept();


        sysUserDept.setUserId(userId);


        sysUserDept.setDeptType("1");


        LoginUser loginUser = getLoginUser();


        SysUser user = loginUser.getUser();


        log.info("--------user的值为：{}", user);




        sysUserDept.setOrgid(user.getOrgid());


        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);


        ajax.put("belongDepts", sysUserDeptKSs);