From bbfc9d48979de7cdab8e439aee37455f01de5c30 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Tue, 5 Apr 2022 13:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=87=E7=AD=BE=E7=BC=96=E8=BE=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java        |  2 +-
 .../tag/controller/OnlCgformTagController.java        | 11 ++++++-----
 .../tag/service/impl/OnlCgformTagServiceImpl.java     |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 90491e8bc..d96c213f4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -2412,7 +2412,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public IPage getInfoPage(Map<String, Object> parameter) {
         String cut = (String) parameter.get("cut");//中英文切换标识
         //需要查询的字段
-        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //日期类型字段
         List<OnlCgformField> onlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
         List<String> fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
index abb99a851..b1a38c42a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
@@ -111,7 +111,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 					this.onlCgformTagService.add(onlCgformTag);
 				}
 
-				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//同步文档库
 					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
 				}else {//同步文档拆分
 					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
@@ -121,7 +121,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			}
 		}else {
 			onlCgformTagService.add(onlCgformTag);
-			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//同步文档库
 				this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
 			}else {//同步文档拆分
 				this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
@@ -151,7 +151,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			if(!existCgformTagList.isEmpty()){//有同名数据
 				if(existCgformTagList.get(0).getId().equals(onlCgformTag.getId())){//已存在同名的数据,就是正在编辑的这个
 					onlCgformTagService.editById(onlCgformTag);
-					if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+					// TODO 能这么比？全是错的，怎么测试的？？？
+					if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//同步文档库
 						this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
 					}else {//同步文档拆分
 						this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
@@ -163,7 +164,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 						onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_0,onlCgformTagDB.getId());
 						onlCgformTag.setId(onlCgformTagDB.getId());
 						onlCgformTagService.editById(onlCgformTag);
-						if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+						if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//同步文档库
 							this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
 						}else {//同步文档拆分
 							this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
@@ -174,7 +175,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 				}
 			}else{
 				onlCgformTagService.editById(onlCgformTag);
-				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//同步文档库
 					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
 				}else {//同步文档拆分
 					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
index 7a22d0e51..060fabd09 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
@@ -80,7 +80,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				}
 			}
 			onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
-			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//设置文档库-表id
+			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL.getValue())) {//设置文档库-表id
 				onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());
 			}else {//设置文档拆分-表id
 				onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_SPLIT_ID.getValue());