维保项列表改用status=2的数据，组织管理修复空指针异常

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -45,7 +45,7 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 10086L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftCategory() != null, "lift_category", req.getLiftCategory())
-                        .eq(req.getStatus() != null, "status", req.getStatus())
+                        .eq( "status",2)
                         .orderByAsc("id"));
         if (page.getRecords().isEmpty()) {
             return RestResponse.success();
@@ -76,7 +76,7 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 10086L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftCategory() != null, "lift_category", req.getLiftCategory())
-                        .eq(req.getStatus() != null, "status", req.getStatus())
+                        .eq("status", 2)
                         .in(sort != null, "sort", sort));
         if (options.isEmpty()) {
             return RestResponse.success();

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -23,7 +23,7 @@ public class OrganizationService {
      * @param project 项目id
      * @return RestResponse 项目相关人员
      */
-    public RestResponse users(Project project) {
+    public RestResponse<?> users(Project project) {
         List<HashMap<String, Object>> projectUsers = projectService.getBaseMapper().users(project.getId());
         if (projectUsers.isEmpty()) {
             return RestResponse.success();
@@ -63,7 +63,7 @@ public class OrganizationService {
      * @return 省，市，区，项目列表
      * @since 2019/12/17 10:05
      */
-    public RestResponse organizationTree(Long mtCompanyId) {
+    public RestResponse<?> organizationTree(Long mtCompanyId) {
         List<Organization> ps = new ArrayList<>();
         List<Organization> cs = new ArrayList<>();
         List<Organization> ds = new ArrayList<>();
@@ -167,6 +167,17 @@ public class OrganizationService {
         }
 
         for (Organization c : cs) {
+            //防止空指针 ---
+            List<Organization> organizations = c.getOrganizations();
+            if (organizations == null || organizations.get(0) == null) {
+                continue;
+            }
+            List<Project> projectsList = organizations.get(0).getProjects();
+            if (projectsList == null || projectsList.get(0) == null) {
+                continue;
+            }
+            //防止空指针 ---
+
             //获取省名
             String province = c.getOrganizations().get(0).getProjects().get(0).getProvince();
             for (Organization p : ps) {
@@ -181,6 +192,6 @@ public class OrganizationService {
         if (ps.isEmpty()) {
             return RestResponse.success();
         }
-        return RestResponse.success(ps, "成功");
+        return RestResponse.success(ps);
     }
 }