WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-15 15:08:08 +08:00
parent 0d5e247642
commit 30a8c1f539
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml
+1 -1
View File
@@ -125,7 +125,7 @@
left join onl_cgform_head och on ocf.cgform_head_id = och.id 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 left join onl_cgform_area oca on ocf.show_area=oca.id
where table_name =#{tableName} and ocf.is_delete = 0 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
</select> </select>
</mapper> </mapper>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+2 -2
View File
@@ -152,7 +152,7 @@ public class SysDictItemController {
* @return * @return
*/ */
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
//@RequiresPermissions("sys:dict:list")未改 //@RequiresPermissions("dict:logicDelete")
@RequestMapping(value = "/logicDelete", method = RequestMethod.DELETE) @RequestMapping(value = "/logicDelete", method = RequestMethod.DELETE)
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> logicDelete(@RequestParam(name="id",required=true) String id) { public Result<SysDictItem> logicDelete(@RequestParam(name="id",required=true) String id) {
@@ -208,7 +208,7 @@ public class SysDictItemController {
* @return * @return
*/ */
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
//@RequiresPermissions("sys:dict:list")未改 //@RequiresPermissions("dict:logicDeleteBatch")
@RequestMapping(value = "/logicDeleteBatch", method = RequestMethod.DELETE) @RequestMapping(value = "/logicDeleteBatch", method = RequestMethod.DELETE)
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<SysDictItem> logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+1 -2
View File
@@ -61,13 +61,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
} else { } else {
onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
onlCgformTag.setCgformHeadId(String.valueOf(FileTableIdEnum.FILE_TABLE_ID));//设置文档库-表id onlCgformTag.setCgformHeadId("FileTableIdEnum.FILE_TABLE_ID");//设置文档库-表id
onlCgformTag.setDbIsKey(0); onlCgformTag.setDbIsKey(0);
onlCgformTag.setDbIsNull(1); onlCgformTag.setDbIsNull(1);
onlCgformTag.setDbPointLength(0); onlCgformTag.setDbPointLength(0);
onlCgformTag.setIsReadOnly(0); onlCgformTag.setIsReadOnly(0);
onlCgformTag.setIsShowForm(1); onlCgformTag.setIsShowForm(1);
onlCgformTag.setDictTable("sys_dict");
Date now = new Date(); Date now = new Date();
onlCgformTag.setCreateTime(now); onlCgformTag.setCreateTime(now);
onlCgformTag.setUpdateTime(now); onlCgformTag.setUpdateTime(now);