From eaa4f0d66db992576e680435a73aee33316d622a Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Sat, 6 May 2023 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/controller/DisasterInfoController.java | 6 ++++++
 .../java/com/kening/vordm/controller/NewsController.java    | 1 +
 .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml     | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

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 04e14d3..b229b12 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
@@ -336,6 +336,12 @@ public class DisasterInfoController {
 	@ApiOperation(value = "提交", notes = "传入Tool")
 	@PostMapping("/submit")
 	public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody DisasterInfo disasterInfo) {
+		LambdaQueryWrapper<GuestManageDisasterRef> qw = new LambdaQueryWrapper<>();
+		qw.eq(GuestManageDisasterRef::getDisasterId,disasterInfo.getId());
+		GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw);
+		one.setStatus(1);
+		one.setManagerId(disasterInfo.getChiefId());
+		guestManageDisasterRefService.updateById(one);
 		return R.status(disasterInfoService.saveOrUpdate(disasterInfo));
 	}
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
index ba7d236..8f4fcd2 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
@@ -72,6 +72,7 @@ public class NewsController {
 		IPage<News> pages = newsService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
 	}
+
 	@PostMapping("review")
 	public R<Boolean> review(String ids ,Integer status){
 		UpdateWrapper<News> updateWrapper = new UpdateWrapper<>();
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index adfd244..a6369d0 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -356,12 +356,14 @@
     </select>
     <select id="chiefData" resultType="java.util.Map">
         SELECT b.`name`, count(*) as val FROM disaster_info t INNER JOIN blade_user b on t.chief_id = b.id
-        where date_format(t.disaster_time,'%Y') = #{year} GROUP BY b.`name` ORDER BY val desc limit 10
+        where date_format(t.disaster_time,'%Y') = #{year} and b.`name` != "超级管理员" GROUP BY b.`name` ORDER BY val desc limit 10
     </select>
+
     <select id="adminData" resultType="java.util.Map">
         SELECT b.`name`, count(*) as val FROM guest_manage_disaster_ref t INNER JOIN blade_user b on t.manager_id = b.id INNER JOIN disaster_info d on d.id = t.disaster_id
         where date_format(d.disaster_time,'%Y') = #{year} and b.role_id = '1123598816738675204' GROUP BY b.`name` ORDER BY val desc limit 10
     </select>
+
     <select id="disasterNum" resultType="java.util.Map">
         SELECT d.dict_value as `name`, count(1) as val FROM disaster_info t INNER JOIN blade_dict_biz d on t.disaster_type = d.dict_key
                 where date_format(t.disaster_time,'%Y') = #{year} GROUP BY d.dict_value