From fe713e0e3a42b5d3b19995215f034c64b83e5f87 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 12 Mar 2024 10:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkSiteDirectManageController.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
index f4b9737f..18ee0804 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
@@ -10,6 +10,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.DirectApplyInfoDetails;
+import com.bonus.sgzb.material.domain.TmTask;
 import com.bonus.sgzb.material.service.ApplyInfoService;
 import com.bonus.sgzb.material.service.TaskService;
 import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
@@ -81,9 +82,11 @@ public class WorkSiteDirectManageController extends BaseController {
                 directApplyInfos.setCreateTime(new Date());
                 int i = workSiteDirectManageService.saveDirectApplyInfo(directApplyInfos);
                 if (i < 0) {
-                    return AjaxResult.success("保存失败");
+                    return AjaxResult.error("保存失败");
                 }
                 id = directApplyInfos.getId();
+            } else {
+                return AjaxResult.error("保存失败");
             }
 
             if (directApplyInfoDetails.getDirectApplyInfoDetails() != null) {
@@ -92,10 +95,12 @@ public class WorkSiteDirectManageController extends BaseController {
                     directApplyDetail.setDirectId(id);
                     int i = workSiteDirectManageService.saveDirectApplyDetails(directApplyDetail);
                     if (i < 0) {
-                        return AjaxResult.success("保存失败");
+                        return AjaxResult.error("保存失败");
                     }
                 }
             }
+        } else {
+            return AjaxResult.error("保存失败");
         }
         return AjaxResult.success("保存成功");
     }
@@ -103,8 +108,8 @@ public class WorkSiteDirectManageController extends BaseController {
   /*  @ApiOperation(value = "通过")
     @PostMapping("/pass")
     public AjaxResult pass(@RequestBody DirectApplyInfoDetails directApplyInfoDetails) {
-        if (directApplyInfoDetails.getDirectApplyInfos() != null) {
-            DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfos();
+        if (directApplyInfoDetails.getDirectApplyInfo() != null) {
+            DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo();
             directApplyInfos.setStatus("1");
             workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfos);
         } else {