From 0a8fcad766d61933564db769ebe48faa6dee29d0 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 31 Mar 2022 16:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE-=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OnlCgformTagController.java    | 45 +++++++++++++------
 .../tag/mapper/xml/OnlCgformTagMapper.xml     |  9 ++--
 .../service/impl/OnlCgformTagServiceImpl.java |  7 ++-
 3 files changed, 44 insertions(+), 17 deletions(-)

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 de84a39ee..abb99a851 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
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -112,13 +111,21 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 					this.onlCgformTagService.add(onlCgformTag);
 				}
 
-				this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+				}else {//同步文档拆分
+					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
+				}
 			}else{
 				throw new JeroBootException("属性已存在,请检查");
 			}
 		}else {
 			onlCgformTagService.add(onlCgformTag);
-			onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+				this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+			}else {//同步文档拆分
+				this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
+			}
 			return result.success("添加成功！");
 		}
 		return result;
@@ -144,7 +151,11 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			if(!existCgformTagList.isEmpty()){//有同名数据
 				if(existCgformTagList.get(0).getId().equals(onlCgformTag.getId())){//已存在同名的数据,就是正在编辑的这个
 					onlCgformTagService.editById(onlCgformTag);
-					onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
+					if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+						this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+					}else {//同步文档拆分
+						this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
+					}
 
 				}else{//已存在同名的数据,不是正在编辑的这个
 					OnlCgformTag onlCgformTagDB =  existCgformTagList.get(0);
@@ -152,14 +163,22 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 						onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_0,onlCgformTagDB.getId());
 						onlCgformTag.setId(onlCgformTagDB.getId());
 						onlCgformTagService.editById(onlCgformTag);
-						onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
+						if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+							this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+						}else {//同步文档拆分
+							this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
+						}
 					}else {//有未删数据,报错
 						return Result.error("属性已存在,请检查");
 					}
 				}
 			}else{
 				onlCgformTagService.editById(onlCgformTag);
-				onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
+				if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//同步文档库
+					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal");
+				}else {//同步文档拆分
+					this.onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_SPLIT_IS_MODEL), "normal");
+				}
 			}
 			return Result.OK("编辑成功！");
 		}
@@ -171,7 +190,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "标签管理-通过id删除")
+/*	@AutoLog(value = "标签管理-通过id删除")
 	@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@RequiresPermissions("tag:delete")
@@ -188,7 +207,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			}
 		}
 		return result;
-	}
+	}*/
 
 	/**
 	 *   逻辑删除
@@ -220,7 +239,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "标签管理-批量删除")
+/*	@AutoLog(value = "标签管理-批量删除")
 	@ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@RequiresPermissions("tag:deleteBatch")
@@ -238,7 +257,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			}
 		}
 		return result;
-	}
+	}*/
 
 	/**
 	 *  批量逻辑删除
@@ -300,16 +319,16 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		return super.exportXls(request, onlCgformTag, OnlCgformTag.class, "标签管理");
 	}
 
-	/**
+/*	*//**
 	 * 通过excel导入数据
 	 *
 	 * @param request
 	 * @param response
 	 * @return
-	 */
+	 *//*
 	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, OnlCgformTag.class);
-	}
+	}*/
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
index a03a68028..b9e53acb8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
@@ -38,9 +38,12 @@
         from onl_cgform_field as f
         left join sys_dict_item as i on f.field_show_type=i.item_value
         left join onl_cgform_area as a on f.show_area=a.id
-        where f.cgform_head_id="48308196e7b04761b533dc31bc899707"
-        and f.is_delete=0
-        and i.dict_id=1493098515761917954
+        where f.is_delete=0
+        and i.dict_id="1493098515761917954"
+
+        <if test="params.isModel != null and params.isModel != ''">
+            and f.is_model=#{params.isModel}
+        </if>
         <!--切换数据成英文-->
         <!-- <choose>
              <when test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
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 83fdb1ad7..7a22d0e51 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,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				}
 			}
 			onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
-			onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());//设置文档库-表id
+			if(onlCgformTag.getIsModel().equals(FileTableIdEnum.FILE_TABLE_IS_MODEL)) {//设置文档库-表id
+				onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());
+			}else {//设置文档拆分-表id
+				onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_SPLIT_ID.getValue());
+			}
+
 			onlCgformTag.setDbIsKey(Integer.valueOf(YesOrNoEnum.NO.getValue()));
 			onlCgformTag.setDbIsNull(Integer.valueOf(YesOrNoEnum.YES.getValue()));
 			onlCgformTag.setDbPointLength(0); //默认为0