diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index d51c179..687f96f 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -84,6 +84,8 @@ public class ShiroConfig { } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/innovationvoucher/innovationVoucher/listcms", "anon"); //创新券 + filterChainDefinitionMap.put("/innovationvoucher/innovationVoucher/queryByIdCms", "anon"); //创新券 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java index b846932..87cf0ff 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java @@ -84,6 +84,36 @@ public class InnovationVoucherController extends JeecgController> listcms(InnovationVoucher innovationVoucher, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(innovationVoucher, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = innovationVoucherService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "创新券表-通过id查询") + @ApiOperation(value="创新券表-通过id查询", notes="创新券表-通过id查询") + @GetMapping(value = "/queryByIdCms") + public Result queryByIdCms(@RequestParam(name="id",required=true) String id) { + InnovationVoucher innovationVoucher = innovationVoucherService.getById(id); + if(innovationVoucher==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(innovationVoucher); + } + /** * 分页列表查询 *