From 5db6a96e8c5c7cc2426ca661c33e9f23c81c8670 Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Mon, 22 May 2023 10:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vordm/controller/DisasterInfoController.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index 6cf8c94..a5fe000 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -333,7 +334,7 @@ public class DisasterInfoController {
 		return R.data(callForHelp);
 	}
 
-
+	private final  AdministratorService administratorService;
 	@PostMapping("review")
 	public R<Boolean> review(@RequestBody DisasterInfo disasterInfo) {
 		//审批通过 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成
@@ -349,16 +350,21 @@ public class DisasterInfoController {
 	@ApiOperation(value = "提交", notes = "传入Tool")
 	@PostMapping("/submit")
 	public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody DisasterInfo disasterInfo) {
+		Long chiefId = disasterInfo.getChiefId();
+		//判断是否是分配
+		String Allocation = disasterInfo.getAllocation();
 		LambdaQueryWrapper<GuestManageDisasterRef> qw = new LambdaQueryWrapper<>();
 		qw.eq(GuestManageDisasterRef::getDisasterId,disasterInfo.getId());
 		GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw);
 		one.setStatus(1);
-		one.setManagerId(disasterInfo.getChiefId());
+		one.setManagerId(chiefId);
 		guestManageDisasterRefService.updateById(one);
-		//判断是否是分配
-		String Allocation = disasterInfo.getAllocation();
+		//获得disasterInfo
+		disasterInfo = disasterInfoService.getById(disasterInfo.getId());
+
+
 		if(!StringUtil.isEmpty(Allocation)){
-			GuestInfo user = guestInfoService.getById(disasterInfo.getChiefId());
+			Administrator user = administratorService.getById(chiefId);
 			//发送邮件
 			Email email = new Email();
 			email.setSubject("You have a new pending disaster");