Merge branch 'develop' into release_temp

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -97,13 +97,14 @@ public class EpmetUserController {
     @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST)
     public Result<List<StaffListResultDTO>> staffPatrolList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
+        //程序稳定 部分安全校验可省略
+        /*if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
                 && !"reportProjectCount".equals(formDTO.getSortCode()) && !"totalTime".equals(formDTO.getSortCode())) {
             throw new RenException("参数错误，排序条件值错误");
-        }
+        }*/
-        if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
+        /*if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
             throw new RenException("参数错误，最近时间值不正确");
-        }
+        }*/
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<List<StaffListResultDTO>>().ok(epmetUserService.staffPatrolList(formDTO));
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -76,8 +76,8 @@
                 AND cs.real_name = #{staffName}
             </if>
             <if test="gridIds != null and gridIds.size() > 0">
-                <foreach collection="gridIds" item="gridId" open="AND (" separator=" OR "  close=" )" >
+                <foreach collection="gridIds" item="gridId" open="AND ssp.grid_id IN (" separator="," close=")">
-                    ssp.grid_id = #{gridId}
+                    #{gridId}
                 </foreach>
             </if>
             GROUP BY ssp.grid_id, ssp.staff_id