From 850bec042e0753d670a934ea7820d859da231f5f Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Fri, 7 Jul 2023 09:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E7=BC=BA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8Bbug-=E6=B6=88=E7=BC=BA=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyMainServiceImpl.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 9d2de73..3e66a8a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -3,7 +3,6 @@ package com.hnac.hzims.operational.duty.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.hnac.hzims.monitor.utils.DateUtils;
@@ -31,7 +30,6 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -39,7 +37,6 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -1226,7 +1223,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 
 	@Override
 	public R getAllPersonInfo(Long deptId) {
-		R<List<User>> allUserList = userClient.userListByDeptId(deptId);
+		R<List<User>> allUserList = userClient.userList("200000",deptId);
 		return allUserList;
 	}
 
@@ -1394,7 +1391,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		Map<Long, ImsDutyClassEntity> deptDutyClassMap = deptDutyClassList.stream().collect(Collectors.toMap(ImsDutyClassEntity::getId, Function.identity()));
 
 		// 获取部门的所有组员
-		List<User> allUserList = userClient.userListByDeptId(deptId).getData();
+		List<User> allUserList = userClient.userList("200000",deptId).getData();
 		Map<Long, String> deptUserMap = allUserList.stream().collect(Collectors.toMap(User::getId, User::getName));
 
 		LambdaQueryWrapper<ImsDutyMainEntity> wrapper = new LambdaQueryWrapper<>();
@@ -1419,7 +1416,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		for (int i = 1; i <= days; i++) {
 			String dateStr = getDate(year, month, i);
 
-			List<User> restUserList = userClient.userListByDeptId(deptId).getData();
+			List<User> restUserList = userClient.userList("200000",deptId).getData();
 
 			// 获取一天的排班
 			List<ImsDutyMainEntity> dutyMainDayList = dutyMainList.stream().filter(var -> dateFormat.format(var.getDutyDate()).equals(dateStr)).collect(Collectors.toList());