Merge branch 'master' into master-任务组

陈昶聿

2 天以前 fcb98e4558897945a316d04555923355b8e60605

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

@@ -709,15 +709,13 @@
//                sysUserDeptMapper.insertSysUserDept(sysUserDep);
//            }
//        }
        //删除原有关系
        SysUserDept delSysUserDept = new SysUserDept();
        delSysUserDept.setUserId(user.getUserId());
        delSysUserDept.setOrgid(user.getOrgid());
        sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

        if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
            //删除原有关系
            SysUserDept delSysUserDept = new SysUserDept();
            delSysUserDept.setUserId(user.getUserId());
            delSysUserDept.setOrgid(user.getOrgid());
            delSysUserDept.setDeptType("1");
            sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

            for (String deptCode : user.getDeptCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), deptCode);
                if (ObjectUtils.isEmpty(sysDept)) {
@@ -739,13 +737,6 @@
        }

        if (!CollectionUtils.isEmpty(user.getWardCodes())) {
            //删除原有关系
            SysUserDept delSysUserDept = new SysUserDept();
            delSysUserDept.setUserId(user.getUserId());
            delSysUserDept.setOrgid(user.getOrgid());
            delSysUserDept.setDeptType("2");
            sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

            for (String wardCode : user.getWardCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), wardCode);
                if (ObjectUtils.isEmpty(sysDept)) {