Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -397,7 +397,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
     public List<PatrolInspectionSite> siteList(String startTime, String endTime) {
         LambdaQueryWrapper<PatrolInspectionSite> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionSite::getTenantId, SecurityUtils.getTenantId());
-        queryWrapper.eq(PatrolInspectionSite::getCollector, SecurityUtils.getUsername());
+        queryWrapper.eq(PatrolInspectionSite::getCollector, SecurityUtils.getLoginUser().getSysUser().getNickName());
         queryWrapper.eq(PatrolInspectionSite::getEnable, 1);
         if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)) {
             queryWrapper.between(PatrolInspectionSite::getCollectTime, startTime, endTime);