区分部门和公司id

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -275,6 +275,7 @@ public class UserServiceImpl implements UserService {
         if(permissionType==1){
             ProgramItem programItem=new ProgramItem();
             programItem.setOrgId(user.getCompanyOrgId());
+            programItem.setOrgCompanyId(user.getCompanyOrgId());
             programItemList.add(programItem);
         }else if(permissionType==2){
             Map<Integer, List<Org>> allOrgs = getAllOrgs(null,user.getTenantId());
@@ -286,6 +287,7 @@ public class UserServiceImpl implements UserService {
         }else if(permissionType==3){
             ProgramItem programItem=new ProgramItem();
             programItem.setOrgId(user.getDeptOrgId());
+            programItem.setOrgDeparmtmentId(user.getDeptOrgId());
             programItemList.add(programItem);
         }else if(permissionType==4) {
             ProgramItem programItem=new ProgramItem();
@@ -296,6 +298,11 @@ public class UserServiceImpl implements UserService {
         }else if(permissionType==5){
             programItemList.addAll( userMapper.findOrgRole(user));
             programItemList.forEach(programItem -> {
+                if("company".equals(programItem.getOrgType())){
+                    programItem.setOrgCompanyId(programItem.getOrgId());
+                }else if("department".equals(programItem.getOrgType())){
+                    programItem.setOrgDeparmtmentId(programItem.getOrgId());
+                }
                 programItem.setCode(user.getTenantId());
             });
         }
@@ -317,6 +324,11 @@ public class UserServiceImpl implements UserService {
             orgs.forEach(org->{
                 ProgramItem item=new ProgramItem();
                 item.setOrgId(org.getId());
+                if("company".equals(org.getOrgType())){
+                    item.setOrgCompanyId(org.getId());
+                }else if("department".equals(org.getOrgType())){
+                    item.setOrgDeparmtmentId(org.getId());
+                }
                 item.setCode(org.getTenantId());
                 programItemList.add(item);
                 getOrg(org.getId(),collect,programItemList);