|
@@ -292,12 +292,12 @@ public class UserServiceImpl implements UserService {
|
|
|
getOrg(user.getCompanyOrgId(),allOrgs,programItemList);
|
|
|
programItemList.add(programItem);
|
|
|
|
|
|
- }else if(permissionType==3){
|
|
|
+ }else if(permissionType==3&&user.getDeptOrgId()!=null){
|
|
|
ProgramItem programItem=new ProgramItem();
|
|
|
programItem.setOrgId(user.getDeptOrgId());
|
|
|
programItem.setOrgDeparmtmentId(user.getDeptOrgId());
|
|
|
programItemList.add(programItem);
|
|
|
- }else if(permissionType==4) {
|
|
|
+ }else if(permissionType==4&&user.getDeptOrgId()!=null) {
|
|
|
ProgramItem programItem=new ProgramItem();
|
|
|
programItem.setOrgId(user.getDeptOrgId());
|
|
|
programItem.setOrgDeparmtmentId(user.getDeptOrgId());
|