96333坐席数据过滤修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -524,13 +524,13 @@
 		<if test="alarmType != null and alarmType != ''">
 			AND a.alarm_type =  #{alarmType}
 		</if>
-		<if test="list != null ">
+		<if test="list != null and list.size() > 0 ">
 			and a.rec_user_id in
 			<foreach collection="list" item="id" separator="," open="(" close=")">
 				#{id}
 			</foreach>
 		</if>
-		<if test="ids != null ">
+		<if test="ids != null and ids.size() > 0 ">
 			and a.sequence_nbr in
 			<foreach collection="ids" item="id" separator="," open="(" close=")">
 				#{id}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java

@@ -408,14 +408,16 @@ public class AlertCalledController extends BaseController {
 
 		//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
 		Set<String> userIds = new HashSet<>();
-		String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
-		List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode,regionCode));
+		String companyCode = this.getSelectedOrgInfo().getCompany().getCompanyCode();
+		List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode,companyCode));
 		if(!ValidationUtil.isEmpty(citInfoList)){
 			for(TzsCitInfo citInfo : citInfoList){
 				userIds.add(citInfo.getCtiUserId());
 			}
 		}
-		queryWrapper.in("rec_user_id",userIds);
+		if (!ValidationUtil.isEmpty(userIds)) {
+			queryWrapper.in("rec_user_id", userIds);
+		}
 
 		if(sort!=null) {  // 排序失效
 			String[] date=  sort.split(",");
@@ -532,8 +534,8 @@ public class AlertCalledController extends BaseController {
 	public void exportAlertRecord(AlertCalledRecordDto alertCalledQueryDto, HttpServletResponse response) {
 		//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
 		Set<String> userIds = new HashSet<>();
-		String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
-		List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, regionCode));
+		String companyCode = this.getSelectedOrgInfo().getCompany().getCompanyCode();
+		List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, companyCode));
 		if (!ValidationUtil.isEmpty(citInfoList)) {
 			for (TzsCitInfo citInfo : citInfoList) {
 				userIds.add(citInfo.getCtiUserId());