1.调整终端管理下，终端和监测点模糊搜索bug

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -1646,7 +1646,6 @@
                 AND device.id = deviceDetail.id
                 AND line.id = lineDetail.id
                 AND vg.Id = voltage.id
-
         <if test="ids!=null and ids.size() > 0">
             AND line.id IN
             <foreach collection="ids" item="item" open="(" close=")" separator=",">
@@ -1655,14 +1654,14 @@
         </if>
         <if test="searchValue!=null and searchValue!='' and type==2">
             and (
-            lineName like CONCAT('%', #{searchValue}, '%')
+                line.NAME like CONCAT('%', #{searchValue}, '%')
-            or subName like CONCAT('%', #{searchValue}, '%')
+                or substation.NAME like CONCAT('%', #{searchValue}, '%')
             )
         </if>
         <if test="searchValue!=null and searchValue!='' and type==1">
             and (
-                devName like CONCAT('%', #{searchValue}, '%')
+                device.NAME like CONCAT('%', #{searchValue}, '%')
-                or subName like CONCAT('%', #{searchValue}, '%')
+                or substation.NAME like CONCAT('%', #{searchValue}, '%')
             )
         </if>
         </where>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -168,9 +168,6 @@ public class UserReportManageController extends BaseController {
     }
 
 
-
-
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     @PostMapping("/cancel")
     @ApiOperation("取消")
@@ -188,6 +185,8 @@ public class UserReportManageController extends BaseController {
     public void downloadSensitiveReportTemplate() {
         userReportPOService.downloadSensitiveReportTemplate();
     }
+
+
     @PostMapping(value = "/importSensitiveReportData", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     @ApiOperation("批量导入干扰源用户")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
@@ -199,7 +198,6 @@ public class UserReportManageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping(value = "/downloadSensitiveUserTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     @ApiOperation("下载敏感及重要用户模板")

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java

@@ -145,6 +145,9 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
         param.setType(quitRunningDeviceQueryParam.getDeviceType());
         param.setSearchValue(quitRunningDeviceQueryParam.getSearchValue());
         List<LineDetailVO.Detail> lineDetail = lineFeignClient.getDeptDeviceDetailData(param).getData();
+        if(CollUtil.isEmpty(lineDetail)){
+            return new Page<>();
+        }
         Map<String, LineDetailVO.Detail> mapDetail=new HashMap<>();
         QueryWrapper<QuitRunningDeviceVO> quitRunningDeviceVOQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(quitRunningDeviceQueryParam)) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -988,7 +988,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
                     userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, ((UserReportParam.UserReportUpdate) userReportParam).getId());
                 } else {
                     userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, (userReportParam).getId());
-
                 }
             }
             List<UserReportPO> userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper);