代码提交

liusheng

4 天以前 25b96c4b510fa4c70511bc99a0e79483acbfd7d9

代码提交

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import javax.validation.Validator;
import java.util.*;
@@ -464,6 +465,9 @@
        if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
            for (String deptCode : user.getDeptCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
                if(ObjectUtils.isEmpty(sysDept)){
                    continue;
                }

                SysUserDept sysUserDept = new SysUserDept();
                sysUserDept.setUserId(user.getUserId());
@@ -487,7 +491,9 @@
        if (!CollectionUtils.isEmpty(user.getWardCodes())) {
            for (String wardCode : user.getWardCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);

                if(ObjectUtils.isEmpty(sysDept)){
                    continue;
                }
                SysUserDept sysUserDept = new SysUserDept();
                sysUserDept.setUserId(user.getUserId());
                sysUserDept.setDeptCode(wardCode);

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -79,7 +79,7 @@
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
        order by d.parent_id, d.order_num
        order by d.dept_type asc, d.parent_id, d.order_num
    </select>

    <select id="selectDeptListByRoleId" resultType="Long">