|
|
@@ -861,8 +861,12 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
@Override
|
|
|
public Object getAllProjectMonth() {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
- Long companyId= 0L;
|
|
|
- companyId = user.getDept().getCompanyId();
|
|
|
+ Long companyId= null;
|
|
|
+ if (user.getUserId()!=1){
|
|
|
+ companyId = user.getDept().getCompanyId();
|
|
|
+ if (companyId==null)user.getDept().getDeptId();
|
|
|
+ }
|
|
|
+
|
|
|
return projectTaskMapper.getAllProjectMonth(companyId);
|
|
|
}
|
|
|
|