主管分管更新员工修改

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -166,7 +166,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             }else{
                 int count = sysStaffOrgService.selectByStaffAndOrg(entity.getOrgSidPath(), sid, "3");
                 SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(sid);
-                return rb.setMsg(sysStaffinfo.getName()+"已在本部门");
+                if(count>0){
+                    return rb.setMsg(sysStaffinfo.getName()+"已在本部门");
+                }
+
             }
             //添加员工与组织的关联关系
             SysStaffOrg sysStaffOrg = new SysStaffOrg();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -178,15 +178,19 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
                 for (String s : split) {
                     //获取本级sid获取本级部门信息
                     SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s);
-                    //从本级部门信息中获取上级sid
-                    String psid = sysOrganization.getPsid();
-                    //从本级部门信息中获取本级部门名称
-                    String bjName = sysOrganization.getName();
-                    //获取上级sid获取上级部门信息
-                    SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid);
-                    //从上级部门信息中获取上级部门名称
-                    String sjName = sysOrganization1.getName();
-                    orgName += sjName + "-" + bjName + ",";
+                    if(sysOrganization == null){
+                        sysStaffOrgService.delByOrgSid(s);
+                    }else{
+                        //从本级部门信息中获取上级sid
+                        String psid = sysOrganization.getPsid();
+                        //从本级部门信息中获取本级部门名称
+                        String bjName = sysOrganization.getName();
+                        //获取上级sid获取上级部门信息
+                        SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid);
+                        //从上级部门信息中获取上级部门名称
+                        String sjName = sysOrganization1.getName();
+                        orgName += sjName + "-" + bjName + ",";
+                    }
                 }
                 orgName = orgName.substring(0, orgName.length() - 1);
                 record.setOrgName(orgName);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -296,7 +296,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         userInfoOneVo.setSid(user.getSid());
         userInfoOneVo.setUserName(user.getUserName());
         userInfoOneVo.setIsAdmin(user.getIsAdmin());
-
         SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData();
         if (sysStaffOrg == null) {
             return null;