smartor代码库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
陈昶聿
2 天以前 f68f81917ae301f57ddca376688a6a968880681c 
 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,7 +61,11 @@


    private ISysPostService postService;




    @Autowired


    @Qualifier("sysUserDeptSystemMapper")


    private SysUserDeptMapper sysUserDeptMapper;




    @Autowired


    private ISysDeptService sysDeptService;




    @Value("${isAdmin}")


    private List<Long> isAdmin;


@@ -145,17 +150,19 @@


        }


        List<SysUserDept> sysUserDeptKSs = null;


        List<SysUserDept> sysUserDeptBQs = null;


        List<SysDept> sysDeptKSs = null;


        List<SysDept> sysDeptBQs = null;


        SysUserDept sysUserDept = new SysUserDept();


        sysUserDept.setUserId(userId);


        sysUserDept.setDeptType("1");




        sysUserDept.setOrgid(user.getOrgid());


        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);


        ajax.put("belongDepts", sysUserDeptKSs);


        sysDeptKSs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);


        ajax.put("belongDepts", sysDeptKSs);




        sysUserDept.setDeptType("2");


        sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);


        ajax.put("belongWards", sysUserDeptBQs);


        sysDeptBQs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);


        ajax.put("belongWards", sysDeptBQs);




        return ajax;


    }