From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas

---
 cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java
index bc6b4a0..baafecf 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java
+++ b/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.CustomClazzName;
+import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.DepartmentDto;
 import com.yuanchu.mom.dto.PersonBasicInfoDetailsDto;
@@ -27,7 +28,7 @@
 
 /**
  * <p>
- *  鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
  * </p>
  *
  * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -36,7 +37,7 @@
 @Api(tags = "浜哄憳-浜哄憳鍩烘湰淇℃伅")
 @RestController
 @RequestMapping("/personBasicInfo")
-@CustomClazzName(name = "璧勬簮瑕佹眰",index = 8)
+//@CustomClazzName(name = "璧勬簮瑕佹眰", index = 8)
 public class PersonBasicInfoController {
 
     @Resource
@@ -45,14 +46,14 @@
     @Resource
     private AnnexService annexService;
 
-    @ValueClassify("浜哄憳鍩烘湰淇℃伅")
+    @ValueAuth
     @ApiOperation(value = "鏌ヨCNAS浜哄憳渚ц竟鏍�")
     @GetMapping("/selectCNSAPersonTree")
     public Result<List<DepartmentDto>> selectCNSAPersonTree() {
         return Result.success(personBasicInfoService.selectCNSAPersonTree());
     }
 
-    @ValueClassify("浜哄憳鍩烘湰淇℃伅")
+    @ValueAuth
     @ApiOperation(value = "鑾峰彇CNAS浜哄憳鍩烘湰淇℃伅")
     @GetMapping("/getCNASPersonnelInfo")
     public Result getCNASPersonnelInfo(Integer userId) {
@@ -67,8 +68,8 @@
         return Result.success();
     }
 
-    @ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
     @ValueClassify("浜哄憳鍩烘湰淇℃伅")
+    @ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
     @GetMapping("basicInformationOfPersonnelSelectPage")
     public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
         return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
@@ -77,11 +78,13 @@
     // 涓婁紶鏂囦欢鎺ュ彛
     @ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
     @PostMapping("/saveCNASFile")
+    @ValueAuth
     public Result saveFile(@RequestPart("file") MultipartFile file) {
         String s = FileSaveUtil.StoreFile(file);
         return Result.success("涓婁紶鎴愬姛", s);
     }
 
+    @ValueAuth
     @GetMapping("/getAnnexByUserId")
     public Result<List<Annex>> getAnnexByUserId(Integer userId) {
         List<Annex> list = annexService.list(new LambdaQueryWrapper<Annex>().eq(Annex::getUserId, userId));
@@ -89,6 +92,7 @@
     }
 
     // 鍒犻櫎鏂囦欢
+    @ValueAuth
     @DeleteMapping("/deleteCNASFile")
     public Result saveFile(String fileName) {
         String[] split = fileName.split(",");
@@ -102,19 +106,23 @@
     /**
      * 浜哄憳鍩烘湰淇℃伅闄勪欢鏂板
      */
+    @ValueAuth
     @PostMapping("/addAnnex")
     public Result addAnnex(@RequestBody Annex annex) {
         annexService.save(annex);
         return Result.success();
     }
 
+    @ValueAuth
     @GetMapping("/getAnnex")
     public Result<Annex> getAnnex(Integer id) {
         return Result.success(annexService.getById(id));
     }
+
     /**
      * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
      */
+    @ValueAuth
     @DeleteMapping("/deleteAnnex/{id}")
     public Result deleteAnnex(@PathVariable("id") Integer id) {
         annexService.removeById(id);
@@ -123,8 +131,8 @@
 
     /**
      * 浜哄憳鍩烘湰淇℃伅闄勪欢淇敼
-     *
      */
+    @ValueAuth
     @PostMapping("/updateAnnex")
     public Result updateAnnex(@RequestBody Annex annex) {
         annexService.updateById(annex);
@@ -133,14 +141,16 @@
 
     @ApiOperation(value = "瀵煎嚭浜哄憳鍩烘湰淇℃伅")
     @PostMapping("/exportPersonBasicInfo")
+    @ValueClassify("浜哄憳鍩烘湰淇℃伅")
     public void exportPersonBasicInfo(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
         UserPageDto userPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
-        personBasicInfoService.exportPersonBasicInfo(userPageDto,response);
+        personBasicInfoService.exportPersonBasicInfo(userPageDto, response);
     }
 
     @ApiOperation(value = "涓嬭浇浜哄憳妗ｆ鍗�")
     @PostMapping("/exportPersonBasicInfoById")
+    @ValueClassify("浜哄憳鍩烘湰淇℃伅")
     public Result exportPersonBasicInfoById(Integer id, HttpServletResponse response) {
-        return Result.success(personBasicInfoService.exportPersonBasicInfoById(id,response));
+        return Result.success(personBasicInfoService.exportPersonBasicInfoById(id, response));
     }
 }

--
Gitblit v1.9.3