From 9c06fb2da3250f7b8bfcb5a2b8bd227528af2678 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 9561e48..9de11ba 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.Custom;
+import com.yuanchu.mom.pojo.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.CustomService;
@@ -60,6 +60,7 @@
map.put("token", jwtToken);
map.put("reToken", jwtReToken);
map.put("name", user.getName());
+ map.put("userId", user.getId());
map.put("power", powerService.selectPowerByRoleId(user.getRoleId()));
return Result.success("鐧诲綍鎴愬姛", map);
}
@@ -100,7 +101,7 @@
}
@ValueClassify("浜哄憳鎬昏")
- @ApiOperation(value = "浜哄憳鎬昏")
+ @ApiOperation(value = "鏌ヨ浜哄憳鎬昏")
@PostMapping("/selectPersonnelOverview")
public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -153,6 +154,13 @@
return Result.success(customService.addCustom(custom));
}
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+ @PostMapping("/upCustom")
+ public Result<?> upCustom(@RequestBody Custom custom) {
+ return Result.success(customService.upCustom(custom));
+ }
+
//鑾峰彇璁惧璐熻矗浜�
@ValueAuth
@ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
@@ -196,4 +204,11 @@
return Result.success(userService.delUserDepardLimsId(id));
}
+ @ValueAuth
+ @GetMapping ("/selectCustomEnum")
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ public Result<?> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
}
--
Gitblit v1.9.3