diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 8dd300240..f35389933 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -72,7 +72,18 @@ public class OnlCgformAreaController extends JeroController list = onlCgformAreaService.queryList(onlCgformArea); return Result.OK(list); } - + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "查询展示区域") + @ApiOperation(value="查询展示区域", notes="查询展示区域") + @GetMapping(value = "/queryShowArea") + public Result> queryShowArea(OnlCgformArea onlCgformArea){ + List list = onlCgformAreaService.queryShowArea(onlCgformArea); + return Result.OK(list); + } /** * 添加 * 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 854c0f18a..cf6274508 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 @@ -37,7 +37,8 @@ import java.util.List; public class OnlCgformTagController extends JeroController { @Autowired private IOnlCgformTagService onlCgformTagService; - + @Autowired + OnlCgformTagController onlCgformAreaService; /** * 分页列表查询 * @@ -121,7 +122,7 @@ public class OnlCgformTagController extends JeroController> selectShowAreaById(@RequestParam(name="id",required=true) String id) { - List list = onlCgformTagService.selectShowAreaById(id); - return Result.OK(list); - } - /** - * 通过id查询字典名称 - * - * @param id - * @return - */ - @AutoLog(value = "标签管理-通过id查询字典名称") - @ApiOperation(value="标签管理-通过id查询字典名称", notes="标签管理-通过id查询字典名称") - @GetMapping(value = "/selectDictNameById") - public Result> selectDictNameById(@RequestParam(name="id",required=true) String id) { - List list = onlCgformTagService.selectDictNameById(id); - return Result.OK(list); - } /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 138aba1cb..63a1a1e68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -59,7 +59,12 @@ public interface IOnlCgformAreaService extends IService { * @return */ List queryList(OnlCgformArea onlCgformArea); - + /** + * 查询展示区域 + * + * @return + */ + List queryShowArea(OnlCgformArea onlCgformArea); /** * 展示区域查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index 647498d45..1b6ee532b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -53,23 +53,9 @@ public interface IOnlCgformTagService extends IService { */ OnlCgformTag queryById(String id); - /** - * 通过id查询展示区域 - * - * @param id - * @return - */ - List selectShowAreaById(String id); + List queryShowAreaById(String id); /** - * 通过id查询字典名称 - * - * @param id - * @return - */ - List selectDictNameById(String id); - - /** * 列表查询 * * @return diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 5e6ebac55..17b7d6068 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -95,6 +95,21 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowArea(OnlCgformArea onlCgformArea) { + QueryWrapper QueryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ + QueryWrapper.select("id","show_area").orderByAsc("sort"); + } + return list(QueryWrapper); + } + /** * 展示区域查询 * 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 f089469a7..4ae59e824 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 @@ -87,20 +87,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl selectShowAreaById(String id) { + public List queryShowAreaById(String id) { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.select("show_area").eq("id",id); return list(queryWrapper); } - /** - *根据id查展示区域 - */ - @Override - public List selectDictNameById(String id) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.select("dict_name").eq("id",id); - return list(queryWrapper); - } + /** * 列表查询 * @@ -120,7 +112,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt())); - Integer count = onlCgformTagMapper.selectCount(queryWrapper); + Integer count = Math.toIntExact(onlCgformTagMapper.selectCount(queryWrapper)); } } diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index 880e6dc17..6475a8390 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -276,7 +276,7 @@ //获取展示区域 loadShowArea(){ let params = {}; - getAction(`tag/onlCgformTag/queryShowArea`,params).then((res)=>{ + getAction(`tag/onlCgformArea/queryShowArea`,params).then((res)=>{ if(res.success){ this.areaOptions=res.result }