异常处理

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -140,9 +140,6 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 
         //组织机构  去掉顶级部门
         List<JSONObject> workshopList = getWorkshop();
-        workshopList = workshopList.stream()
-                .filter(item -> !LuckySheet4SummaryHelp.RECTIFY_DICT_TOP.equals(item.getString("PID")))
-                .collect(Collectors.toList());
 
         //构件
         List<String> structureList = itpProjectNodesService.getStructureByProjectId(manageDo.getId());
@@ -517,11 +514,14 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 //        List<JSONObject> workshopList = luckysheetDao.getWorkshop();
 
         //额外数据字典中配置
-        List<JSONObject> workshopDictList = luckysheetDao.getWorkshopDict();
+        List<JSONObject> workshopList = luckysheetDao.getWorkshopDict();
 
 //        workshopList.addAll(workshopDictList);
 
-        return workshopDictList;
+        workshopList = workshopList.stream()
+                .filter(item -> !LuckySheet4SummaryHelp.RECTIFY_DICT_TOP.equals(item.getString("PID")))
+                .collect(Collectors.toList());
+        return workshopList;
     }
 
     /**
@@ -991,27 +991,29 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         //一级部门
                         JSONObject firstObj = orgIdMap.get(departOrg.getString("PID"));
                         //如果上一级选择的基地内id，表示选择的是一级部门
-                        // 选择一级部门
-                        if("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
-                            machine.setFirstdeptid(departOrg.getString("ID"));
-                            machine.setFirstdeptname(realDepartName);
-                            machine.setIfoutsidebase("outside");
-                        } else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
-                            machine.setFirstdeptid(departOrg.getString("ID"));
-                            machine.setFirstdeptname(realDepartName);
-                            machine.setIfoutsidebase("inside");
-                        }
-                        //选择二级部门情况
-                        else {
-                            //一级部门
-                            machine.setFirstdeptid(firstObj.getString("ID"));
-                            machine.setFirstdeptname(firstObj.getString("SHORTNAME"));
-
-                            //基地内外
-                            if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("PID"))) {//长兴基地
-                                machine.setIfoutsidebase("inside");
-                            } else {
+                        if(ObjectUtil.isNotEmpty(firstObj)) {
+                            // 选择一级部门
+                            if ("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
+                                machine.setFirstdeptid(departOrg.getString("ID"));
+                                machine.setFirstdeptname(realDepartName);
                                 machine.setIfoutsidebase("outside");
+                            } else if ("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
+                                machine.setFirstdeptid(departOrg.getString("ID"));
+                                machine.setFirstdeptname(realDepartName);
+                                machine.setIfoutsidebase("inside");
+                            }
+                            //选择二级部门情况
+                            else {
+                                //一级部门
+                                machine.setFirstdeptid(firstObj.getString("ID"));
+                                machine.setFirstdeptname(firstObj.getString("SHORTNAME"));
+
+                                //基地内外
+                                if ("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("PID"))) {//长兴基地
+                                    machine.setIfoutsidebase("inside");
+                                } else {
+                                    machine.setIfoutsidebase("outside");
+                                }
                             }
                         }