文档库新增页排序+标签修改

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java

@@ -8,8 +8,6 @@ package com.jero.common.constant.enums;
 public enum ModuleEnum {
     DOCUMENT_LIBRARY("文档管理","1"),
     OCR_RECORD("OCR识别转换记录表","2"),
-    ONL_CGFORM_TAG("标签项管理","3"),
-    ONL_CGFORM_AREA("展示区域管理","4"),
     ONL_CGFORM_COLLECTION("我的收藏","5"),
     ONL_CGFORM_SUBSCRIBE("我的订阅","6");
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml

@@ -119,12 +119,13 @@
 			</otherwise>
 		</choose>
 	</select>
-
+	<!-- 查询新增表单数据,并且按照展示区域的"排序号"和字段的"展示顺序"排序  -->
 	<select id="getFieldList" resultType="com.jero.generater.modules.online.cgform.entity.OnlCgformField">
 		select * from onl_cgform_field ocf
 		left join onl_cgform_head och on ocf.cgform_head_id = och.id
+		left join onl_cgform_area oca on ocf.show_area=oca.id
 		where table_name =#{tableName} and ocf.is_delete = 0
-		order by order_num asc
+		order by oca.sort asc,order_num asc
 	</select>
 
 </mapper>

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java

@@ -818,10 +818,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()+" ");
         }else if(ModuleEnum.OCR_RECORD.getValue().equals(flag)){
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.OCR_RECORD.getTable());
-        }else if(ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)){
-            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.TAG.getTable());
-        }else if(ModuleEnum.ONL_CGFORM_AREA.getValue().equals(flag)){
-            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.TAG_AREA.getTable());
         }else if(ModuleEnum.ONL_CGFORM_COLLECTION.getValue().equals(flag)){
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.ONL_CGFORM_COLLECTION.getTable());
         }else if(ModuleEnum.ONL_CGFORM_SUBSCRIBE.getValue().equals(flag)){