From 1e8c585539875ea00695a489ee890ce414c4026f Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 5 Sep 2024 08:15:07 +0800
Subject: [PATCH] =?UTF-8?q?#=E8=AE=BE=E5=A4=87feign=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java     | 2 +-
 .../src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml   | 3 ++-
 .../operational/station/service/impl/UserDeptConfigServiceImpl.java    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
index adfc78e..fd998c1 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java
@@ -151,7 +151,7 @@ public class EmInfoClient implements IEmInfoClient {
 
 	@Override
 	@GetMapping(EM_INFO_LIST)
-	public R<List<EmInfoEntity>> emInfoList(EmInfoEntity req) {
+	public R<List<EmInfoEntity>> emInfoList(@RequestParam("req") EmInfoEntity req) {
 		LambdaQueryWrapper<EmInfoEntity> queryWrapper = Condition.getQueryWrapper(EmInfoEntity.class, req);
 		return R.data(service.list(queryWrapper));
 	}
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index abc6520..3bc04c3 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -234,10 +234,11 @@
     <select id="getListPageOfTaskRecord" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.entity.TaskEntity">
         SELECT t.* from HZ_ST_EX_TASK t
         where t.IS_DELETED=0
+
         <include refid="getTaskListSql"></include>
         order by t.UPDATE_TIME desc
     </select>
-
+、
     <select id="getFinishTaskList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
         SELECT t.* from HZ_ST_EX_TASK t
         LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/UserDeptConfigServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/UserDeptConfigServiceImpl.java
index 14c71de..dc4264d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/UserDeptConfigServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/UserDeptConfigServiceImpl.java
@@ -91,6 +91,7 @@ public class UserDeptConfigServiceImpl extends ServiceImpl<UserDeptConfigMapper,
         if(depts.isSuccess() && ObjectUtil.isNotEmpty(depts.getData())){
             Optional<Dept> optional = depts.getData().stream().min(Comparator.comparing(Dept::getDeptCategory));
             if(optional.isPresent()){
+                config.setDeptCategory(optional.get().getDeptCategory());
                 config.setDeptId(optional.get().getId());
                 config.setDeptName(optional.get().getDeptName());
                 if(optional.get().getDeptCategory() == 4){