From e8d0a2f9375da4d04da4a06a0f9fa8ef448512c4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 十一月 2024 15:58:49 +0800
Subject: [PATCH] 检验下单审核进行企业微信推送

---
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java |   13 +++++++++++--
 1 files changed, 11 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 9de11ba..dd6bf5b 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
@@ -93,6 +93,15 @@
 
     @ValueClassify("鐢ㄦ埛绠$悊")
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
+    @PostMapping("/selectUserList2")
+    public Result selectUserList2(@RequestBody Map<String, Object> data) throws Exception {
+        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+        UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+        return Result.success(userService.selectUserList(page, user));
+    }
+
+    @ValueAuth
+    @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃(鐢ㄤ簬鍏朵粬椤甸潰鑾峰彇鐢ㄦ埛鏁版嵁)")
     @PostMapping("/selectUserList")
     public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -144,8 +153,8 @@
     @ValueClassify("瀹㈡埛绠$悊")
     @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
     @PostMapping("/delCustomById")
-    public Result<?> delCustomById(Integer id) {
-        return Result.success(customService.delCustomById(id));
+    public Result<?> delCustomById(Long id) {
+        return Result.success(customService.removeById(id));
     }
     @ValueClassify("瀹㈡埛绠$悊")
     @ApiOperation(value = "鏂板瀹㈡埛淇℃伅")

--
Gitblit v1.9.3