From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 02 一月 2025 18:44:28 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java index ca63645..057affa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.project.domain.ServiceDonateannex; import com.ruoyi.project.domain.ServiceFund; import com.ruoyi.project.domain.ServiceFundtax; import com.ruoyi.project.domain.vo.FundTaxVO; @@ -41,11 +42,14 @@ * 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛� */ @ApiOperation("鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�") - @PreAuthorize("@ss.hasPermi('system:fundtax:list')") @GetMapping("/list") public TableDataInfo list(ServiceFundtax serviceFundtax) { startPage(); List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax); + Collections.sort(list, (sft1, sft2) -> { + Long i = sft2.getId() - sft1.getId(); + return i.intValue(); + }); return getDataTable(list); } // @@ -53,7 +57,7 @@ // * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛� // */ // @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�") -// @PreAuthorize("@ss.hasPermi('system:fundtax:export')") +// // @PreAuthorize("@ss.hasPermi('system:fundtax:export')") // @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT) // @GetMapping("/export") // public AjaxResult export(ServiceFundtax serviceFundtax) { @@ -66,7 +70,6 @@ * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭� */ @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�") - @PreAuthorize("@ss.hasPermi('system:fundtax:query')") @GetMapping(value = "/getInfo/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id); @@ -81,7 +84,6 @@ * 淇敼涓撳璐圭敤绠楃◣鐢宠涓� */ @ApiOperation("淇敼涓撳璐圭敤绠楃◣鐢宠涓�") - @PreAuthorize("@ss.hasPermi('system:fundtax:edit')") @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.UPDATE) @PostMapping("/edit") @RepeatSubmit @@ -93,7 +95,6 @@ * 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓� */ @ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�") - @PreAuthorize("@ss.hasPermi('system:fundtax:remove')") @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE) @GetMapping("/remove/{id}") public AjaxResult remove(@PathVariable Long id) { @@ -105,7 +106,6 @@ * 鏂板涓撳璐圭敤绠楃◣鐢宠涓� */ @ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�") - @PreAuthorize("@ss.hasPermi('system:fundtax:add')") @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT) @PostMapping("/addFundTax") public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) { -- Gitblit v1.9.3