Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-gateway/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.18
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.17</version>
+    <version>0.3.18</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -170,8 +170,8 @@
                 <gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri>
 <!--                <gateway.routes.resi-home-server.uri>http://localhost:8104</gateway.routes.resi-home-server.uri>-->
                 <!--  26、政府端-党建声音              -->
-<!--                <gateway.routes.gov-voice-server.uri>lb://gov-voice-server</gateway.routes.gov-voice-server.uri>-->
-                                <gateway.routes.gov-voice-server.uri>http://localhost:8105</gateway.routes.gov-voice-server.uri>
+                <gateway.routes.gov-voice-server.uri>lb://gov-voice-server</gateway.routes.gov-voice-server.uri>
+<!--                                <gateway.routes.gov-voice-server.uri>http://localhost:8105</gateway.routes.gov-voice-server.uri>-->
                 <!--  27、居民端-党建声音              -->
                 <gateway.routes.resi-voice-server.uri>lb://resi-voice-server</gateway.routes.resi-voice-server.uri>
                 <!--                <gateway.routes.resi-voice-server.uri>http://localhost:8106</gateway.routes.resi-voice-server.uri>-->

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.49
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.50
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.49</version>
+    <version>0.3.50</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

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());
 	}