wangys 6 gadi atpakaļ
vecāks
revīzija
1afe03da53

+ 15 - 12
efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -215,18 +215,21 @@ public class ManageServiceImpl implements ManageService {
         manage.setDepartment(departmentRepository.find(manage.getDeptId()));
         manage.setProject(projectRepository.find(manage.getProjectId()));
         manage.setProduct(productRepository.find(manage.getProductId()));
-        switch (manage.getCompanyType()){
-            case COMPANY:
-                manage.setCompany(companyRepository.find(manage.getCompanyId()));
-                break;
-            case PROJECT:
-                manage.setCompany(projectRepository.find(manage.getCompanyId()));
-                break;
-            case DEPARTMENT:
-                manage.setCompany(departmentRepository.find(manage.getDeptId()));
-                break;
-            default:
-                break;
+        if(Objects.nonNull(manage.getCompanyType())){
+
+            switch (manage.getCompanyType()){
+                case COMPANY:
+                    manage.setCompany(companyRepository.find(manage.getCompanyId()));
+                    break;
+                case PROJECT:
+                    manage.setCompany(projectRepository.find(manage.getCompanyId()));
+                    break;
+                case DEPARTMENT:
+                    manage.setCompany(departmentRepository.find(manage.getDeptId()));
+                    break;
+                default:
+                    break;
+            }
         }
         return ApiResult.ok(manage);
     }