queryWrapper = new LambdaQueryWrapper<>();
+ if(StringUtils.isNotBlank(name) && !"null".equals(name)){
+ queryWrapper.like(Storage::getName,name);
+ }
+
+ IPage result = storageService.pageCC(page,queryWrapper);
+ return Result.success(result.getRecords(),result.getTotal());
+ }
+
+}
diff --git a/WarehouseManagerApi - eclipse/src/main/java/com/rabbiter/controller/UserController.java b/WarehouseManagerApi - eclipse/src/main/java/com/rabbiter/controller/UserController.java
new file mode 100644
index 00000000..8c059b4a
--- /dev/null
+++ b/WarehouseManagerApi - eclipse/src/main/java/com/rabbiter/controller/UserController.java
@@ -0,0 +1,225 @@
+package com.rabbiter.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.rabbiter.common.QueryPageParam;
+import com.rabbiter.common.Result;
+import com.rabbiter.entity.Menu;
+import com.rabbiter.entity.User;
+import com.rabbiter.service.MenuService;
+import com.rabbiter.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 前端控制器：用户管理和管理员管理模块
+ *
+ *
+ * @author rabbiter
+ * @since 2023-01-02
+ */
+@RestController
+@RequestMapping("/user")
+public class UserController {
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private MenuService menuService;
+
+ /*
+ * 查询全部用户
+ * @author rabbiter
+ * @date 2023/1/2 19:26
+ */
+ @GetMapping("/list")
+ public List list(){
+ return userService.list();
+ }
+
+ /*
+ * 根据账号查找用户
+ * @author rabbiter
+ * @date 2023/1/4 14:53
+ */
+ @GetMapping("/findByNo")
+ public Result findByNo(@RequestParam String no){
+ List list = userService.lambdaQuery()
+ .eq(User::getNo,no)
+ .list();
+ return list.size()>0?Result.success(list):Result.fail();
+ }
+
+ /*
+ * 新增用户
+ * @author rabbiter
+ * @date 2023/1/2 19:11
+ */
+ @PostMapping("/save")
+ public Result save(@RequestBody User user){
+ return userService.save(user)?Result.success():Result.fail();
+ }
+
+ /*
+ * 更新用户
+ * @author rabbiter
+ * @date 2023/1/2 19:11
+ */
+ @PostMapping("/update")
+ public Result update(@RequestBody User user){
+ return userService.updateById(user)?Result.success():Result.fail();
+ }
+
+ /*
+ * 用户登录：登录的时候一并将菜单信息也查询出来
+ * @author rabbiter
+ * @date 2023/1/3 14:08
+ */
+ @PostMapping("/login")
+ public Result login(@RequestBody User user){
+ //匹配账号和密码
+ List list = userService.lambdaQuery()
+ .eq(User::getNo,user.getNo())
+ .eq(User::getPassword,user.getPassword())
+ .list();
+
+ if(list.size()>0){
+ User user1 = (User)list.get(0);
+ List