From 89aaa6508aa6c6494488e6cb03fb5c780e04370f Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Wed, 12 Apr 2023 10:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9F=A5=E8=AF=A2-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/entity/DataUpload.java    | 5 +++++
 .../com/kening/vordm/controller/AdministratorController.java | 2 +-
 .../com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
index 75c92e8..a68b636 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
@@ -2,6 +2,11 @@ package com.kening.vordm.entity;
 
 import lombok.Data;
 
+/**
+ * 数据上传实体类
+ * @author liyuchen
+ * @date 2023/04/12
+ */
 @Data
 public class DataUpload extends EntityData{
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
index 51e5ad8..50a326a 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
@@ -35,7 +35,7 @@ public class AdministratorController {
 	public R<IPage<Administrator>> pages(Query query, @RequestParam Map<String,Object> params){
 		//查出角色名为chief的角色id 放入params中进行分页查询
 		Long roleId = service.getChiefRole("chief");
-		params.put("roleId_equal",roleId);
+		params.put("roleId_equal",String.valueOf(roleId));
 		return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,Administrator.class)));
 	}
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
index 642e552..922141e 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
@@ -36,5 +36,10 @@
         left join disaster_info di on gmdr.disaster_id = di.id
         left join blade_user bu on gmdr.manager_id = bu.id
         left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
+        <where>
+            <if test="params.managerName!=null and params.managerName!=''">
+                and bu.name like concat('%',#{params.managerName},'%')
+            </if>
+        </where>
     </select>
 </mapper>