非项目设备申请项目id传0

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -99,6 +99,8 @@ public class CmcDeviceApprovalController extends BaseController
         cmcDeviceApproval.setUseDept(getLoginUser().getDeptId());
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
         cmcDeviceApproval.setProjectId(formDataJson.getString("projectId"));
+        if (formDataJson.getString("projectId") == null)
+            cmcDeviceApproval.setProjectId("0");
         cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("beginDate"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endDate"));

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -128,13 +128,15 @@ public class CmcProjectController extends BaseController
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
-        cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
-        String qualityInspector = cmcProject.getQualityInspector();
-        StringBuilder qualityInspectorName = new StringBuilder();
-        if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
-            for (String inspector : qualityInspector.split(","))
-                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+        if (cmcProject != null) {
+            cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
+            String qualityInspector = cmcProject.getQualityInspector();
+            StringBuilder qualityInspectorName = new StringBuilder();
+            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+                for (String inspector : qualityInspector.split(","))
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+                cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+            }
         }
         return success(cmcProject);
     }