From c2b451080841be0605ca85ea55a2db674714fba0 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 29 八月 2024 18:45:33 +0800
Subject: [PATCH] 配置

---
 src/main/java/com/zy/system/controller/UserController.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index f3ec1c2..74fc93f 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -1,8 +1,8 @@
 package com.zy.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
@@ -28,7 +28,7 @@
     @RequestMapping(value = "/user/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") Long id) {
-        return R.ok(userService.selectById(String.valueOf(id)));
+        return R.ok(userService.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/user/list/auth")
@@ -39,31 +39,31 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
         excludeTrash(param);
-        EntityWrapper<User> wrapper = new EntityWrapper<>();
+        QueryWrapper<User> wrapper = new QueryWrapper<>();
         convert(param, wrapper);
-        wrapper.orderBy("id", false);
+        wrapper.orderByDesc("id");
         if (9527 == getUserId()) {
-            return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+            return R.ok(userService.page(new Page<>(curr, limit), wrapper));
         }
 
         Long roleId = getUser().getRoleId();
-        Role role = roleService.selectById(roleId);
+        Role role = roleService.getById(roleId);
         Long leaderId = role.getLeader();
         if (null != leaderId) {
             List<Long> leaderIds = new ArrayList<>();
             leaderIds.add(role.getId());
             while (leaderId != null) {
-                Role leader = roleService.selectById(leaderId);
+                Role leader = roleService.getById(leaderId);
                 leaderIds.add(leader.getId());
                 leaderId = leader.getLeader();
             }
             wrapper.notIn("role_id", leaderIds);
         }
 
-        return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+        return R.ok(userService.page(new Page<>(curr, limit), wrapper));
     }
 
-    private void convert(Map<String, Object> map, EntityWrapper wrapper){
+    private void convert(Map<String, Object> map, QueryWrapper wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             if (entry.getKey().endsWith(">")) {
                 wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -82,7 +82,7 @@
             return R.error();
         }
         if (null == user.getId()){
-            userService.insert(user);
+            userService.save(user);
         } else {
             userService.updateById(user);
         }
@@ -92,7 +92,7 @@
     @RequestMapping(value = "/user/add/auth")
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
     public R add(User user) {
-        userService.insert(user);
+        userService.save(user);
         return R.ok();
     }
 
@@ -102,7 +102,7 @@
         if (Cools.isEmpty(user) || null==user.getId()){
             return R.error();
         }
-        User entity = userService.selectById(user.getId());
+        User entity = userService.getById(user.getId());
         if (user.getPassword()!=null) {
             entity.setPassword(user.getPassword());
         }
@@ -122,7 +122,7 @@
         if (Cools.isEmpty(ids)){
             return R.error();
         }
-        userService.deleteBatchIds(Arrays.asList(ids));
+        userService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 
@@ -130,19 +130,19 @@
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
     public R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-        EntityWrapper<User> wrapper = new EntityWrapper<>();
+        QueryWrapper<User> wrapper = new QueryWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
         convert(map, wrapper);
-        List<User> list = userService.selectList(wrapper);
+        List<User> list = userService.list(wrapper);
         return R.ok(exportSupport(list, fields));
     }
 
     @RequestMapping(value = "/userQuery/auth")
     @ManagerAuth
     public R query(String condition) {
-        EntityWrapper<User> wrapper = new EntityWrapper<>();
+        QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.like("username", condition);
-        Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+        Page<User> page = userService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (User user : page.getRecords()){
             Map<String, Object> map = new HashMap<>();

--
Gitblit v1.9.1