Merge remote-tracking branch 'remotes/origin/dev' into release

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.43
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.44
     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.43</version>
+    <version>0.3.44</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

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

@@ -321,6 +321,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	@Override
 	public Boolean previewSaveDraftAttr(TokenDto tokenDto, DraftAttrFromDTO fromDTO) {
+		log.debug("previewSaveDraftAttr param:{}",JSON.toJSONString(fromDTO));
 		//校验参数
 		ValidatorUtils.validateEntity(fromDTO);
 		if (DraftConstant.TOP.equals(fromDTO.getIsTop()) && StringUtils.isBlank(fromDTO.getCoverImg())) {
@@ -334,8 +335,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			throw new RenException(ModuleConstant.DRAFT_IS_TOP_ERROR);
 		}
 
-		if (!DraftConstant.AGENCY.equals(fromDTO.getPublisherType()) || !DraftConstant.DEPARTMENT.equals(fromDTO.getPublisherType())
+		if (!DraftConstant.AGENCY.equals(fromDTO.getPublisherType()) && !DraftConstant.DEPARTMENT.equals(fromDTO.getPublisherType())
-				|| !DraftConstant.GRID.equals(fromDTO.getPublisherType())) {
+				&& !DraftConstant.GRID.equals(fromDTO.getPublisherType())) {
 			throw new RenException(ModuleConstant.DRAFT_PUBLISHER_TYPE_ERROR);
 		}
 		return saveDraftAttr(tokenDto, fromDTO);