Merge branch 'dev_pingyiin_zqf' into dev

epmet-gateway/src/main/resources/bootstrap.yml

@@ -516,6 +516,7 @@ epmet:
     - /oper/customize/customerstartpage/homestartpage
     - /epmet/point/mqCallback/**
     - /tduck-api/**
+    - /data/report/screenPyHistoryScore/dplist
     #居民信息采集：查询楼栋，单元，房屋，提交信息
     - /gov/org/icneighborhood/open/list
     - /gov/org/icbuilding/buildingoption

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -456,7 +456,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         //2.获取工作人员缓存信息
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), resultDTO.getStaffId());
         if (null == staffInfo) {
-            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId()));
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", resultDTO.getStaffId()));
         }
         //3.获取网格缓存信息
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(resultDTO.getGridId());