From 2f13f59f023fba63aa993172d48c14bcaaafb233 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 16 五月 2024 13:53:34 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java index 3476b1a..3f4fe47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java @@ -102,7 +102,7 @@ * 鏌ヨ璐圭敤鐢宠涓诲垪琛� */ @ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�") - //@PreAuthorize("@ss.hasPermi('project:fund:list')") + //// @PreAuthorize("@ss.hasPermi('project:fund:list')") @GetMapping("/list") public TableDataInfo list(ServiceFund serviceFund) { startPage(); @@ -196,7 +196,7 @@ } @ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�") - //@PreAuthorize("@ss.hasPermi('project:fund:list')") + //// @PreAuthorize("@ss.hasPermi('project:fund:list')") @GetMapping(value = "/getInfo/{infoid}") public AjaxResult getInfoByInfoId(@PathVariable("infoid") Long infoid) { return AjaxResult.success(serviceFundService.getInfoByInfoId(infoid)); @@ -218,7 +218,7 @@ * 瀵煎嚭璐圭敤鐢宠涓诲垪琛� */ @ApiOperation("瀵煎嚭璐圭敤鐢宠涓诲垪琛�") - //@PreAuthorize("@ss.hasPermi('project:fund:export')") + //// @PreAuthorize("@ss.hasPermi('project:fund:export')") @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ServiceFund serviceFund) { @@ -232,7 +232,7 @@ * 鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭� */ @ApiOperation("鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭�") - //@PreAuthorize("@ss.hasPermi('project:fund:query')") + //// @PreAuthorize("@ss.hasPermi('project:fund:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(serviceFundService.getById(id)); @@ -242,7 +242,7 @@ * 鏂板璐圭敤鐢宠涓� */ @ApiOperation("鏂板璐圭敤鐢宠涓�") - //@PreAuthorize("@ss.hasPermi('project:fund:add')") + //// @PreAuthorize("@ss.hasPermi('project:fund:add')") @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT) @PostMapping("/add") @RepeatSubmit @@ -571,7 +571,7 @@ * 鍒犻櫎璐圭敤鐢宠涓� */ @ApiOperation("鍒犻櫎璐圭敤鐢宠涓�") - //@PreAuthorize("@ss.hasPermi('project:fund:remove')") + //// @PreAuthorize("@ss.hasPermi('project:fund:remove')") @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { @@ -1012,7 +1012,7 @@ throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT); } ServiceExternalperson infoByUserNo = null; - if (StringUtils.isNotBlank(serviceFund.getUserno())) { + if (StringUtils.isNotBlank(serviceFund.getUserno()) && serviceFund.getApplytype().equals("5")) { infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno()); } -- Gitblit v1.9.3