diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java index 79cbf66..544f092 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java @@ -202,7 +202,7 @@ public class KnzzGlApplyController extends BaseController { /** * 获取国家励志奖学金详细信息 */ - @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')") +// @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')") @GetMapping(value = "/{id}") @ApiOperation("获取国家励志奖学金详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -225,7 +225,7 @@ public class KnzzGlApplyController extends BaseController { /** * 修改国家励志奖学金 */ - @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')") +// @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')") @Log(title = "国家励志奖学金", businessType = BusinessType.UPDATE) @PostMapping("/update") @ApiOperation("修改国家励志奖学金") diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java index 0988137..a4d2bf2 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java @@ -107,9 +107,9 @@ public class KnzzGlApplyServiceImpl extends ServiceImplCURDATE()-INTERVAL 90 DAY ) t - group by tools_type,xq order by xq,totalnum desc + group by tools_type,xq order by xq,count(1) desc