Merge branch 'dev_routine_work' into develop

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ApprovaledListFromDTO.java

@@ -18,7 +18,8 @@ public class ApprovaledListFromDTO implements Serializable {
     private static final long serialVersionUID = 5700160700676332579L;
     private String customerId;
     @NotBlank(message = "组织id不能为空")
-    private String agencyId;
+    private String orgId;
+    private String orgType;
     private String startTime;
     private String endTime;
     private String staffId;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3058,8 +3058,15 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public PageData<ApprovaledListResultDTO> approvaledList(ApprovaledListFromDTO formDTO) {
+		if (StringUtils.isNotBlank(formDTO.getStaffId()) && ProjectConstant.ORG_TYPE_GRID.equals(formDTO.getOrgType())) {
+			CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+			if (null == staff) {
+				throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取工作人员信息失败");
+			}
+			formDTO.setOrgId(staff.getAgencyId());
+		}
 		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-		List<ApprovaledListResultDTO> list = baseDao.getGridMemberProjectList(formDTO.getAgencyId(), formDTO.getStaffId(),
+		List<ApprovaledListResultDTO> list = baseDao.getGridMemberProjectList(formDTO.getOrgId(), formDTO.getStaffId(),
 				formDTO.getStartTime(), formDTO.getEndTime());
 		PageInfo<ApprovaledListResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -919,6 +919,9 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 			result.getList().forEach(item -> {
 				//工作人员姓名
 				CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), item.getStaffId());
+				if (null == staff) {
+					throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取工作人员信息失败");
+				}
 				item.setStaffName(staff.getRealName());
 				//项目分类
 				Set<String> categoryList = projectCategory.get(item.getProjectId());