Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

# Conflicts:
#	epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
#	epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java

@@ -57,10 +57,6 @@ public class CommonArticleListFormDTO implements Serializable {
     private Integer pageNo;
     @NotNull(message = "pageSize不能为空", groups = YanTaiDingShowGroup.class)
     private Integer pageSize;
-
+    @NotBlank(message = "tagId不能为空",groups = YanTaiDingShowGroup.class)
-    /**
-     * 标签名称(高级配置里的参数)
-     * */
-    @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class)
     private String tagId;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -342,7 +342,8 @@ public class ArticleController {
 		return new Result<PageData<ArticleLatestResultDTO>>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(),
 				formDTO.getPageSize(),
 				formDTO.getGridId(),
-				formDTO.getTagName(),formDTO.getTagId()));
+				formDTO.getTagName(),
+				formDTO.getTagId()));
 	}
 
 

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java

@@ -89,7 +89,7 @@ public class TagController {
      */
     @PostMapping("page-list")
     public Result<PageData<TagCustomerDTO>> pageList(@LoginUser TokenDto tokenDto,@RequestBody TagCustomerPageFormDTO formDTO){
-        tokenDto.setCustomerId(formDTO.getCustomerId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO,TagCustomerPageFormDTO.PageUserInternalGroup.class,TagCustomerPageFormDTO.PageUserShowGroup.class);
         return new Result<PageData<TagCustomerDTO>>().ok(tagCustomerService.page(formDTO));
     }

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

@@ -2020,7 +2020,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				gridId,
 				tagName,
 				EpmetRequestHolder.getLoginUserCustomerId(),
-				null,tagId);
+				null,
+				tagId);
 		PageInfo<ArticleLatestResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());
 	}

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -534,8 +534,8 @@
         WHERE
             art.DEL_FLAG = '0'
           AND art.CUSTOMER_ID = #{customerId}
-            <if test="tagId != null and tagId != '' ">
+            <if test="tagName != null and tagName != '' ">
-                AND t.TAG_ID = #{tagId}
+                AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' )
             </if>
             <if test="gridId != null and gridId != '' ">
                 and apr.GRID_ID=#{gridId}
@@ -543,8 +543,8 @@
             <if test="agencyId != null and agencyId != '' ">
                 AND art.org_id_path like concat('%',#{agencyId},'%')
             </if>
-            <if test="tagName != null and tagName != '' ">
+            <if test="tagId != null and tagId != '' ">
-                AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' )
+                AND t.tag_id =#{tagId}
             </if>
         ORDER BY
             art.PUBLISH_DATE DESC,