diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 66b22a611..936a1c832 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -116,8 +116,8 @@ public class SysCategoryController { * @param * @return */ - @AutoLog(value = "标签内容-树形结构-通过sysDictId查询") - @ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询") + @AutoLog(value = "标签内容-树形结构-通过名称查询") + @ApiOperation(value="标签内容-树形结构-通过名称查询", notes="标签内容-树形结构-通过名称查询") @GetMapping(value = "/queryBySysName") public Result queryBySysName(@RequestParam(name="id",required=true) String sysName) { List sysCategory = sysCategoryService.queryBySysName(sysName); @@ -136,7 +136,6 @@ public class SysCategoryController { public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); try { - sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0); sysCategoryService.addSysCategory(sysCategory); result.success("添加成功！"); } catch (Exception e) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 23b26f7c2..e2fe7d671 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -76,6 +76,7 @@ public class SysDictController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); + queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictService.page(page, queryWrapper); log.debug("查询当前页："+pageList.getCurrent()); 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 9808e5dec..51ca3d495 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 @@ -55,7 +55,7 @@ public class SysDictItemController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); - queryWrapper.orderByAsc("sort_order"); + queryWrapper.orderByAsc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 02a03b7a9..b368b3204 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -72,5 +72,5 @@ public interface ISysCategoryService extends IService { */ List getSysCategoryTree(); - List queryBySysName(String sysName); + List queryBySysName(String sysDictId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 5ec5fb25e..6733da937 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.util.FillRuleUtil; @@ -59,6 +60,7 @@ public class SysCategoryServiceImpl extends ServiceImpl queryBySysDictId(String sysDictId) { QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("sys_dict_id",sysDictId); + queryWrapper.eq("sys_dict_id",sysDictId).eq("del_flag", CommonConstant.DEL_FLAG_0); return list(queryWrapper); } - +/**搜索条件*/ @Override public List queryBySysName(String sysName) { QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.like("name",sysName); + queryWrapper.like("name",sysName).eq("del_flag", CommonConstant.DEL_FLAG_0); return list(queryWrapper); } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index 61a8e4b6f..95f6d2dcc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -86,10 +86,10 @@ public class OnlCgformTag implements Serializable { @ApiModelProperty(value = "字段英文名称描述") private java.lang.String dbFieldEnName; - /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type") + /**属性类型*/ + @Excel(name = "属性类型", width = 15,dicCode ="field_show_type") @Dict(dicCode ="field_show_type") - @ApiModelProperty(value = "表单控件类型") + @ApiModelProperty(value = "属性类型") private java.lang.String fieldShowType; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index 3cf2aaee4..def178225 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -27,6 +27,7 @@ public interface OnlCgformTagMapper extends BaseMapper { "left join sys_dict_item as i on f.field_show_type=i.item_value\n" + "left join onl_cgform_area as a on f.show_area=a.id\n" + "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + + "and f.is_delete=0\n" + "and i.dict_id=1493098515761917954 \n" + "order by f.create_time desc ") IPage queryPageList(IPage page,@Param("params") Map params);