文章列表修改

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java

@@ -71,8 +71,8 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @param tagIdList
 	 * @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
 	 */
-	@DataFilter(tableAliases = "a")
-	List<PublishedListResultDTO> selectArticleListForAgency(@Param("customerId") String customerId, @Param("tagIdList") List<String> tagIdList);
+	@DataFilter(tableAliases = "a", gridIdsArgName = "gridList")
+	List<PublishedListResultDTO> selectArticleListForAgency(@Param("customerId") String customerId, @Param("tagIdList") List<String> tagIdList, Set<String> gridList);
 
 	/**
 	 * 已发布列表---网格工作人员

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -605,13 +605,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		}
 		if (AGENCY.equals(staffLevel)) {
-			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList());
+			Set<String> gridList = new HashSet<>();
+			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
 		} else {
 			Set<String> gridList = new HashSet<>();
 			if (null != userInfo.getGridIdList()) {
 				gridList = userInfo.getGridIdList();
 			}
-			resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
+			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
 		}
 		resultList.forEach(result -> {
 			String tags = result.getTags();
@@ -627,12 +628,33 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	public PageData offlineList(TokenDto tokenDto, OfflineListFormDTO formDTO) {
 		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 
+		List<CustomerStaffRoleResultDTO> roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
 		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
 		loginUserDetailsFormDTO.setApp(tokenDto.getApp());
 		loginUserDetailsFormDTO.setClient(tokenDto.getClient());
 		loginUserDetailsFormDTO.setUserId(tokenDto.getUserId());
 		LoginUserDetailsResultDTO userInfo = epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO).getData();
-		List<OfflineListResultDTO> resultList = baseDao.selectOfflineList(userInfo.getGridIdList());
+		String staffLevel = "";
+		for (CustomerStaffRoleResultDTO role : roles) {
+			//党建负责人
+			if (RoleKeyConstants.ROLE_KEY_PARTY_PRINCIPALS.equals(role.getRoleKey())) {
+				staffLevel = AGENCY;
+				break;
+			} else if (RoleKeyConstants.ROLE_KEY_GRID_PARTY_DIRECTOR.equals(role.getRoleKey())){
+				staffLevel = GRID;
+			}
+		}
+		List<OfflineListResultDTO> resultList = new ArrayList<>();
+		if (GRID.equals(staffLevel)) {
+			Set<String> gridList = new HashSet<>();
+			if (null != userInfo.getGridIdList()) {
+				gridList = userInfo.getGridIdList();
+			}
+			resultList = baseDao.selectOfflineList(gridList);
+		} else {
+			Set<String> gridList = new HashSet<>();
+			resultList = baseDao.selectOfflineList(gridList);
+		}
 		PageInfo<OfflineListResultDTO> pageInfo = new PageInfo<>(resultList);
 		return new PageData<>(resultList, pageInfo.getTotal());
 	}