diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml index 203cd3de6..4090811fa 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml @@ -125,7 +125,7 @@ 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 oca.sort asc,order_num asc + order by oca.sort asc,ocf.order_num asc,ocf.create_time asc diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index ce5844196..6db43fa91 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -152,7 +152,7 @@ public class SysDictItemController { * @return */ //@RequiresRoles({"admin"}) - //@RequiresPermissions("sys:dict:list")未改 + //@RequiresPermissions("dict:logicDelete") @RequestMapping(value = "/logicDelete", method = RequestMethod.DELETE) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDelete(@RequestParam(name="id",required=true) String id) { @@ -208,7 +208,7 @@ public class SysDictItemController { * @return */ //@RequiresRoles({"admin"}) - //@RequiresPermissions("sys:dict:list")未改 + //@RequiresPermissions("dict:logicDeleteBatch") @RequestMapping(value = "/logicDeleteBatch", method = RequestMethod.DELETE) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { 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 16515665c..32f0bf834 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 @@ -61,13 +61,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl