设备车辆申请可以无项目

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

@@ -176,14 +176,16 @@ public class CmcCarApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                if (project.getCars() != null) {
-                    String[] projectCars = project.getCars().split(",");
-                    String[] cars = carString.split(",");
-                    project.setCars(String.join(",", CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars))));
+                if (project != null) {
+                    if (project.getCars() != null) {
+                        String[] projectCars = project.getCars().split(",");
+                        String[] cars = carString.split(",");
+                        project.setCars(String.join(",", CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars))));
+                    }
+                    else
+                        project.setCars(carString);
+                    cmcProjectService.updateCmcProject(project);
                 }
-                else
-                    project.setCars(carString);
-                cmcProjectService.updateCmcProject(project);
             }
             String[] cars = carString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);

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

@@ -1,4 +1,4 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -92,6 +92,6 @@ public class CmcContractPaidController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractPaidService.deleteCmcContractPaidByContractIds(contractIds));
+        return success(cmcContractPaidService.deleteCmcContractPaidByContractIds(contractIds));
     }
 }

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

@@ -152,14 +152,16 @@ public class CmcDeviceApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                if (project.getDevices() != null) {
-                    String[] projectDevices = project.getDevices().split(",");
-                    String[] devices = deviceString.split(",");
-                    project.setDevices(String.join(",", CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices))));
+                if (project != null) {
+                    if (project.getDevices() != null) {
+                        String[] projectDevices = project.getDevices().split(",");
+                        String[] devices = deviceString.split(",");
+                        project.setDevices(String.join(",", CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices))));
+                    }
+                    else
+                        project.setDevices(deviceString);
+                    cmcProjectService.updateCmcProject(project);
                 }
-                else
-                    project.setDevices(deviceString);
-                cmcProjectService.updateCmcProject(project);
             }
             String[] devices = deviceString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);