修改普通管理员查询-liyuchen

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{
 

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)));
 	}
 

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>