diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
index 7b43468..ee63990 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
@@ -1,13 +1,12 @@
 package com.cfive.pinnacle.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cfive.pinnacle.controller.permission.UserController;
 import com.cfive.pinnacle.entity.Affair;
-import com.cfive.pinnacle.entity.Attendance;
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.service.IAffairService;
-import com.cfive.pinnacle.service.IUserService;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +30,7 @@ public class AffairController {
 //    IUserService userService;
 //    不用userService的方法了，userController中已经写好了直接拿来用
     @Autowired
-    UserController userController;
+UserController userController;
 
 
     @PostMapping("/add")
@@ -41,7 +40,7 @@ public class AffairController {
 
     @GetMapping("/add/getUser")
     public  ResponseResult getUser() {
-        List<User> userList = (List<User>)userController.getAllUser().getData();
+        List<User> userList = userController.getAllUser().getData();
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",userList);
     }//获取数据库中所有用户
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserWorkController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserWorkController.java
deleted file mode 100644
index e0d57dd..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserWorkController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.cfive.pinnacle.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 中间表-用户-工作事项 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/userWork")
-public class UserWorkController {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
index b16a5d5..6a2319f 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
@@ -1,22 +1,14 @@
 package com.cfive.pinnacle.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.cfive.pinnacle.entity.User;
 import com.cfive.pinnacle.entity.UserWork;
 import com.cfive.pinnacle.entity.Work;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.service.IUserWorkService;
 import com.cfive.pinnacle.service.IWorkService;
-import com.cfive.pinnacle.service.impl.UserWorkServiceImpl;
-import com.cfive.pinnacle.service.impl.WorkServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/ElementController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/ElementController.java
deleted file mode 100644
index cbe8fce..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/ElementController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.cfive.pinnacle.controller.permission;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.entity.permission.Element;
-import com.cfive.pinnacle.service.permission.IElementService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 页面元素 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/element")
-public class ElementController {
-    private IElementService elementService;
-
-    @Autowired
-    public void setElementService(IElementService elementService) {
-        this.elementService = elementService;
-    }
-
-    @GetMapping
-    public ResponseResult getAllElement() {
-        List<Element> elements = elementService.list();
-
-        return ResponseResult.databaseSelectSuccess(elements);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseResult getElement(@PathVariable long id) {
-        LambdaQueryWrapper<Element> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Element::getId, id);
-        Element element = elementService.getOne(wrapper);
-
-        return ResponseResult.databaseSelectSuccess(element);
-    }
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/FileController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/FileController.java
deleted file mode 100644
index 2ffb710..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/FileController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.cfive.pinnacle.controller.permission;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.entity.permission.File;
-import com.cfive.pinnacle.service.permission.IFileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 文件 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/file")
-public class FileController {
-    private IFileService fileService;
-
-    @Autowired
-    public void setFileService(IFileService fileService) {
-        this.fileService = fileService;
-    }
-
-    @GetMapping
-    public ResponseResult getAllFile() {
-        List<File> files = fileService.list();
-
-        return ResponseResult.databaseSelectSuccess(files);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseResult getFile(@PathVariable int id) {
-        LambdaQueryWrapper<File> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(File::getId, id);
-        File file = fileService.getOne(wrapper);
-
-        return ResponseResult.databaseSelectSuccess(file);
-    }
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/GroupController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
similarity index 95%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/controller/GroupController.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
index 59d85f0..d1261b5 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/GroupController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
@@ -1,10 +1,10 @@
-package com.cfive.pinnacle.controller;
+package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.Group;
+import com.cfive.pinnacle.entity.permission.Group;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.service.IGroupService;
+import com.cfive.pinnacle.service.permission.IGroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java
index 5c8bea9..4e248c4 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java
@@ -1,10 +1,11 @@
 package com.cfive.pinnacle.controller.permission;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.service.permission.ILoginService;
-import com.cfive.pinnacle.utils.WebUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,7 @@ import java.util.HashMap;
 
 @RestController
 @CrossOrigin
+@Tag(name = "登录", description = "登录相关接口")
 public class LoginController {
 
     private ILoginService loginService;
@@ -22,14 +24,16 @@ public class LoginController {
         this.loginService = loginService;
     }
 
+    @Operation(summary = "登录")
     @PostMapping("/login")
-    public ResponseResult login(@RequestBody User user) {
+    public ResponseResult<HashMap<String, String>> login(@RequestBody User user) {
         HashMap<String, String> hashMap = loginService.login(user);
         return ResponseResult.build(ResponseCode.LOGIN_SUCCESS, "Login Success", hashMap);
     }
 
+    @Operation(summary = "登出")
     @RequestMapping("/logout")
-    public ResponseResult logout(HttpServletRequest request) {
+    public ResponseResult<?> logout(HttpServletRequest request) {
         boolean result = loginService.logout(request.getHeader("token"));
         if (result) {
             return ResponseResult.build(ResponseCode.LOGOUT_SUCCESS, "Logout Success", null);
@@ -37,9 +41,4 @@ public class LoginController {
             return ResponseResult.build(ResponseCode.LOGOUT_FAILED, "Logout Failed", null);
         }
     }
-
-    @GetMapping("/userInfo")
-    public ResponseResult getUserInfo() {
-        return ResponseResult.success(WebUtil.getLoginUser());
-    }
 }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/MenuController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/MenuController.java
deleted file mode 100644
index 3583d35..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/MenuController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.cfive.pinnacle.controller.permission;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.cfive.pinnacle.service.permission.IMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 菜单 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/menu")
-public class MenuController {
-    private IMenuService menuService;
-
-    @Autowired
-    public void setMenuService(IMenuService menuService) {
-        this.menuService = menuService;
-    }
-
-    @GetMapping
-    public ResponseResult getAllMenu() {
-        List<Menu> menus = menuService.list();
-
-        return ResponseResult.databaseSelectSuccess(menus);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseResult getMenu(@PathVariable int id) {
-        LambdaQueryWrapper<Menu> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Menu::getId, id);
-        Menu menu = menuService.getOne(wrapper);
-
-        return ResponseResult.databaseSelectSuccess(menu);
-    }
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationController.java
deleted file mode 100644
index f262245..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.cfive.pinnacle.controller.permission;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.entity.permission.Operation;
-import com.cfive.pinnacle.service.permission.IOperationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 功能 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/operation")
-public class OperationController {
-    private IOperationService operationService;
-
-    @Autowired
-    public void setOperationService(IOperationService operationService) {
-        this.operationService = operationService;
-    }
-
-    @GetMapping
-    public ResponseResult getAllOperation() {
-        List<Operation> operations = operationService.list();
-
-        return ResponseResult.databaseSelectSuccess(operations);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseResult getOperation(@PathVariable int id) {
-        LambdaQueryWrapper<Operation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Operation::getId, id);
-        Operation operation = operationService.getOne(wrapper);
-
-        return ResponseResult.databaseSelectSuccess(operation);
-    }
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationLogController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationLogController.java
index f7031ad..a9404ef 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationLogController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationLogController.java
@@ -31,14 +31,14 @@ public class OperationLogController {
     }
 
     @GetMapping
-    public ResponseResult getAllOperationLog() {
+    public ResponseResult<List<OperationLog>> getAllOperationLog() {
         List<OperationLog> operationLogs = operationLogService.list();
 
         return ResponseResult.databaseSelectSuccess(operationLogs);
     }
 
     @GetMapping("/{id}")
-    public ResponseResult getOperationLog(@PathVariable int id) {
+    public ResponseResult<OperationLog> getOperationLog(@PathVariable int id) {
         LambdaQueryWrapper<OperationLog> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OperationLog::getId, id);
         OperationLog operationLog = operationLogService.getOne(wrapper);
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/PowerTypeController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/PowerTypeController.java
deleted file mode 100644
index 507293a..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/PowerTypeController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.cfive.pinnacle.controller.permission;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.entity.permission.*;
-import com.cfive.pinnacle.service.permission.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 权限类型 前端控制器
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@RestController
-@RequestMapping("/powerType")
-public class PowerTypeController {
-    IPowerTypeService powerTypeService;
-
-    public void setPowerTypeService(IPowerTypeService powerTypeService) {
-        this.powerTypeService = powerTypeService;
-    }
-
-    @GetMapping
-    public ResponseResult getAllPowerType() {
-        List<PowerType> powerTypes = powerTypeService.list();
-
-        return ResponseResult.databaseSelectSuccess(powerTypes);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseResult getPowerType(@PathVariable int id) {
-        LambdaQueryWrapper<PowerType> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PowerType::getId, id);
-        PowerType powerType = powerTypeService.getOne(wrapper);
-
-        return ResponseResult.databaseSelectSuccess(powerType);
-    }
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/RoleController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java
similarity index 95%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/controller/RoleController.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java
index 8dfdbd2..de28e9f 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/RoleController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java
@@ -1,10 +1,10 @@
-package com.cfive.pinnacle.controller;
+package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.Role;
+import com.cfive.pinnacle.entity.permission.Role;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.service.IRoleService;
+import com.cfive.pinnacle.service.permission.IRoleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
similarity index 96%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserController.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
index 17d3ee5..4bcb9d6 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
@@ -1,10 +1,10 @@
-package com.cfive.pinnacle.controller;
+package com.cfive.pinnacle.controller.permission;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
-import com.cfive.pinnacle.service.IUserService;
+import com.cfive.pinnacle.service.permission.IUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java
index b3e99d7..a4c786c 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java
@@ -10,6 +10,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java
index c0eebdf..bcb7c9b 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java
@@ -10,6 +10,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 
+import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java
index 599baf4..6d03d9a 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java
@@ -11,6 +11,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java
index 41757e9..ff5b0df 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java
@@ -11,6 +11,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.cfive.pinnacle.entity.permission.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Group.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Group.java
similarity index 96%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/Group.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Group.java
index 538b9b5..dbcd097 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Group.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Group.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/LoginUser.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/LoginUser.java
index cb8176f..2269904 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/LoginUser.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/LoginUser.java
@@ -1,6 +1,5 @@
 package com.cfive.pinnacle.entity.permission;
 
-import com.cfive.pinnacle.entity.User;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerSet.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerSet.java
index 6c0882d..df15024 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerSet.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerSet.java
@@ -18,11 +18,11 @@ public class PowerSet implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    private List<Operation> operationList;
-
     private List<Menu> menuList;
 
     private List<Element> elementList;
 
+    private List<Operation> operationList;
+
     private List<File> fileList;
 }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Role.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Role.java
similarity index 87%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/Role.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Role.java
index ddf7870..142350d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Role.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Role.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,10 +10,6 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 
-import com.cfive.pinnacle.entity.permission.Element;
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.cfive.pinnacle.entity.permission.Operation;
-import com.cfive.pinnacle.entity.permission.Power;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/RoleGroup.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/RoleGroup.java
similarity index 96%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/RoleGroup.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/RoleGroup.java
index d26c71c..8f5ecdd 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/RoleGroup.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/RoleGroup.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/User.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/User.java
similarity index 89%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/User.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/User.java
index ff09e6d..586a702 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/User.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/User.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,9 +9,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 
-import com.cfive.pinnacle.entity.permission.Element;
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.cfive.pinnacle.entity.permission.Operation;
+import com.cfive.pinnacle.entity.Staff;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserGroup.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserGroup.java
similarity index 96%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserGroup.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserGroup.java
index 4a0b024..cb82546 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserGroup.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserGroup.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserRole.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserRole.java
similarity index 96%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserRole.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserRole.java
index acee355..91c0b5d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserRole.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserRole.java
@@ -1,4 +1,4 @@
-package com.cfive.pinnacle.entity;
+package com.cfive.pinnacle.entity.permission;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/GroupMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
similarity index 80%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/GroupMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
index 938594c..c537eb2 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/GroupMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.Group;
+import com.cfive.pinnacle.entity.permission.Group;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerTypeMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerTypeMapper.java
deleted file mode 100644
index 7beb88c..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerTypeMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.cfive.pinnacle.mapper.permission;
-
-import com.cfive.pinnacle.entity.permission.PowerType;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 权限类型 Mapper 接口
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Mapper
-public interface PowerTypeMapper extends BaseMapper<PowerType> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleGroupMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleGroupMapper.java
similarity index 74%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleGroupMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleGroupMapper.java
index 17dd6a7..1f28c85 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleGroupMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleGroupMapper.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.RoleGroup;
+import com.cfive.pinnacle.entity.permission.RoleGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
similarity index 80%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
index b9eca8f..ff5a804 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
@@ -1,7 +1,7 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 import java.util.List;
 
-import com.cfive.pinnacle.entity.Role;
+import com.cfive.pinnacle.entity.permission.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserGroupMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserGroupMapper.java
similarity index 74%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserGroupMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserGroupMapper.java
index 42bc47e..93af79d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserGroupMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserGroupMapper.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.UserGroup;
+import com.cfive.pinnacle.entity.permission.UserGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
similarity index 83%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
index 408aa1c..8db2756 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserRoleMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserRoleMapper.java
similarity index 74%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserRoleMapper.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserRoleMapper.java
index bdf21b1..cfcc193 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserRoleMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserRoleMapper.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.mapper;
+package com.cfive.pinnacle.mapper.permission;
 
-import com.cfive.pinnacle.entity.UserRole;
+import com.cfive.pinnacle.entity.permission.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleGroupService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleGroupService.java
deleted file mode 100644
index 52896e2..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleGroupService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service;
-
-import com.cfive.pinnacle.entity.RoleGroup;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 中间表-角色-用户组 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IRoleGroupService extends IService<RoleGroup> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserGroupService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserGroupService.java
deleted file mode 100644
index fa58a72..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserGroupService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service;
-
-import com.cfive.pinnacle.entity.UserGroup;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 中间表-用户-用户组 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IUserGroupService extends IService<UserGroup> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserRoleService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserRoleService.java
deleted file mode 100644
index 77617ef..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service;
-
-import com.cfive.pinnacle.entity.UserRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 中间表-用户-角色 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IUserRoleService extends IService<UserRole> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserWorkService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserWorkService.java
deleted file mode 100644
index 1654976..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserWorkService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service;
-
-import com.cfive.pinnacle.entity.UserWork;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 中间表-用户-工作事项 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IUserWorkService extends IService<UserWork> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
index f9d8f4d..b0c51a7 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
@@ -1,22 +1,16 @@
 package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cfive.pinnacle.entity.Attendance;
 import com.cfive.pinnacle.mapper.AttendanceMapper;
-import com.cfive.pinnacle.mapper.UserMapper;
+import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.IAttendanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,8 +35,7 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
 
     @Override
     public List<Attendance> getAttendanceAndUserByid(Long userId) {
-        List<Attendance> attendances = attendanceMapper.getAttendanceAndUserByid(userId);
-        return attendances;
+        return attendanceMapper.getAttendanceAndUserByid(userId);
     }
 
     @Override
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java
index b16f309..00cef07 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java
@@ -1,16 +1,12 @@
 package com.cfive.pinnacle.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cfive.pinnacle.entity.Department;
-import com.cfive.pinnacle.entity.User;
 import com.cfive.pinnacle.mapper.DepartmentMapper;
-import com.cfive.pinnacle.mapper.UserMapper;
 import com.cfive.pinnacle.service.IDepartmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,8 +21,7 @@ import java.util.List;
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements IDepartmentService {
     @Autowired
     private DepartmentMapper departmentMapper;
-    @Autowired
-    private UserMapper userMapper;
+
     @Override
     public List<Department> getDepartAndUser() {
         return departmentMapper.getDepartAndUser();
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java
index 9b71156..4d9f220 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java
@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.Notice;
 import com.cfive.pinnacle.entity.NoticeReceive;
-import com.cfive.pinnacle.entity.common.ResponseCode;
-import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.mapper.NoticeMapper;
 import com.cfive.pinnacle.mapper.NoticeReceiveMapper;
 import com.cfive.pinnacle.mapper.NoticeTypeMapper;
-import com.cfive.pinnacle.mapper.UserMapper;
+import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.service.INoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleGroupServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleGroupServiceImpl.java
deleted file mode 100644
index af66bd6..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleGroupServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.impl;
-
-import com.cfive.pinnacle.entity.RoleGroup;
-import com.cfive.pinnacle.mapper.RoleGroupMapper;
-import com.cfive.pinnacle.service.IRoleGroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 中间表-角色-用户组 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class RoleGroupServiceImpl extends ServiceImpl<RoleGroupMapper, RoleGroup> implements IRoleGroupService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserGroupServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserGroupServiceImpl.java
deleted file mode 100644
index 6c2c86e..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserGroupServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.impl;
-
-import com.cfive.pinnacle.entity.UserGroup;
-import com.cfive.pinnacle.mapper.UserGroupMapper;
-import com.cfive.pinnacle.service.IUserGroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 中间表-用户-用户组 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup> implements IUserGroupService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserRoleServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserRoleServiceImpl.java
deleted file mode 100644
index 9a9b4ea..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.impl;
-
-import com.cfive.pinnacle.entity.UserRole;
-import com.cfive.pinnacle.mapper.UserRoleMapper;
-import com.cfive.pinnacle.service.IUserRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 中间表-用户-角色 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements IUserRoleService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserWorkServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserWorkServiceImpl.java
deleted file mode 100644
index 63d3fa9..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserWorkServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.impl;
-
-import com.cfive.pinnacle.entity.UserWork;
-import com.cfive.pinnacle.mapper.UserWorkMapper;
-import com.cfive.pinnacle.service.IUserWorkService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 中间表-用户-工作事项 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class UserWorkServiceImpl extends ServiceImpl<UserWorkMapper, UserWork> implements IUserWorkService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java
index a2fc995..ed01283 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java
@@ -2,11 +2,10 @@ package com.cfive.pinnacle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.cfive.pinnacle.entity.Notice;
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.UserWork;
 import com.cfive.pinnacle.entity.Work;
-import com.cfive.pinnacle.mapper.UserMapper;
+import com.cfive.pinnacle.mapper.permission.UserMapper;
 import com.cfive.pinnacle.mapper.UserWorkMapper;
 import com.cfive.pinnacle.mapper.WorkMapper;
 import com.cfive.pinnacle.service.IWorkService;
@@ -17,8 +16,6 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.DecimalFormat;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -101,7 +98,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     public double getProgress(Long workId) {
         double workNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId));
         double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId).eq("status",1));
-        double progress = 0;
+        double progress;
         progress = (completeNum / workNum) * 100;
         progress = (double) Math.round(progress * 100) / 100;
         return progress;
@@ -115,10 +112,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
     public boolean addWork(Work work) {
-        boolean flag = true;
-        if (workMapper.insert(work) <= 0) {
-            flag = false;
-        }
+        boolean flag = workMapper.insert(work) > 0;
         long workId = work.getId();
         for (User user :
                 work.getWorker()) {
@@ -135,11 +129,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
     public boolean deleteByWorkId(Long workId) {
-        boolean flag = false;
-        if (userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", workId)) > 0 && workMapper.deleteById(workId) > 0) {
-            flag = true;
-        }
-        return flag;
+        return userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", workId)) > 0 && workMapper.deleteById(workId) > 0;
     }
 
     @Override
@@ -151,10 +141,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
     public boolean updateWork(Work work) {
-        boolean flag = true;
-        if (userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", work.getId())) <= 0) {
-            flag = false;
-        }
+        boolean flag = userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", work.getId())) > 0;
         if (workMapper.update(null, new UpdateWrapper<Work>().eq("id", work.getId()).set("old", 1)) <= 0) {
             flag = false;
         }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IElementService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IElementService.java
deleted file mode 100644
index 035c027..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IElementService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.Element;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 页面元素 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IElementService extends IService<Element> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IFileService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IFileService.java
deleted file mode 100644
index ab6b605..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IFileService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.File;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 文件 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IFileService extends IService<File> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IGroupService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
similarity index 79%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/IGroupService.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
index f4e47e3..2f991b4 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IGroupService.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.service;
+package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.Group;
+import com.cfive.pinnacle.entity.permission.Group;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/ILoginService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/ILoginService.java
index b791258..c155395 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/ILoginService.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/ILoginService.java
@@ -1,6 +1,6 @@
 package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 
 import java.util.HashMap;
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IMenuService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IMenuService.java
deleted file mode 100644
index 0084b1e..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IMenuService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 菜单 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IMenuService extends IService<Menu> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IOperationService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IOperationService.java
deleted file mode 100644
index cce8de5..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IOperationService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.Operation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 功能 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IOperationService extends IService<Operation> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerRoleService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerRoleService.java
deleted file mode 100644
index c0cbe6f..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.PowerRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 中间表-权限-角色 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IPowerRoleService extends IService<PowerRole> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerTypeService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerTypeService.java
deleted file mode 100644
index 627885a..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerTypeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cfive.pinnacle.service.permission;
-
-import com.cfive.pinnacle.entity.permission.PowerType;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 权限类型 服务类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-public interface IPowerTypeService extends IService<PowerType> {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java
similarity index 78%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleService.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java
index f0e5482..db761a6 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleService.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.service;
+package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.Role;
+import com.cfive.pinnacle.entity.permission.Role;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
similarity index 81%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserService.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
index c6a176d..153392e 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserService.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
@@ -1,6 +1,6 @@
-package com.cfive.pinnacle.service;
+package com.cfive.pinnacle.service.permission;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/ElementServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/ElementServiceImpl.java
deleted file mode 100644
index 42f0790..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/ElementServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.Element;
-import com.cfive.pinnacle.mapper.permission.ElementMapper;
-import com.cfive.pinnacle.service.permission.IElementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 页面元素 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class ElementServiceImpl extends ServiceImpl<ElementMapper, Element> implements IElementService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/FileServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/FileServiceImpl.java
deleted file mode 100644
index 9c0d135..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/FileServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.File;
-import com.cfive.pinnacle.mapper.permission.FileMapper;
-import com.cfive.pinnacle.service.permission.IFileService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 文件 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IFileService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/GroupServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
similarity index 90%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/GroupServiceImpl.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
index ce1a6f2..90c2583 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/GroupServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cfive.pinnacle.service.impl;
+package com.cfive.pinnacle.service.permission.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.Group;
-import com.cfive.pinnacle.entity.RoleGroup;
-import com.cfive.pinnacle.mapper.GroupMapper;
-import com.cfive.pinnacle.mapper.RoleGroupMapper;
-import com.cfive.pinnacle.service.IGroupService;
+import com.cfive.pinnacle.entity.permission.Group;
+import com.cfive.pinnacle.entity.permission.RoleGroup;
+import com.cfive.pinnacle.mapper.permission.GroupMapper;
+import com.cfive.pinnacle.mapper.permission.RoleGroupMapper;
+import com.cfive.pinnacle.service.permission.IGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java
index a080400..0bc3320 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java
@@ -1,6 +1,6 @@
 package com.cfive.pinnacle.service.permission.impl;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.permission.LoginUser;
 import com.cfive.pinnacle.service.permission.ILoginService;
 import com.cfive.pinnacle.utils.JwtUtil;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/MenuServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/MenuServiceImpl.java
deleted file mode 100644
index 3d52a26..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/MenuServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.cfive.pinnacle.mapper.permission.MenuMapper;
-import com.cfive.pinnacle.service.permission.IMenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 菜单 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/OperationServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/OperationServiceImpl.java
deleted file mode 100644
index 0ae5df3..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/OperationServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.Operation;
-import com.cfive.pinnacle.mapper.permission.OperationMapper;
-import com.cfive.pinnacle.service.permission.IOperationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 功能 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class OperationServiceImpl extends ServiceImpl<OperationMapper, Operation> implements IOperationService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerRoleServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerRoleServiceImpl.java
deleted file mode 100644
index d73c114..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.PowerRole;
-import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
-import com.cfive.pinnacle.service.permission.IPowerRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 中间表-权限-角色 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class PowerRoleServiceImpl extends ServiceImpl<PowerRoleMapper, PowerRole> implements IPowerRoleService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java
index cb113ea..55866ec 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java
@@ -1,7 +1,8 @@
 package com.cfive.pinnacle.service.permission.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cfive.pinnacle.entity.permission.*;
-import com.cfive.pinnacle.mapper.permission.PowerMapper;
+import com.cfive.pinnacle.mapper.permission.*;
 import com.cfive.pinnacle.service.permission.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,38 +20,38 @@ import java.util.List;
  */
 @Service
 public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements IPowerService {
-    private IOperationService operationService;
-    private IMenuService menuService;
-    private IElementService elementService;
-    private IFileService fileService;
+    private MenuMapper menuMapper;
+    private ElementMapper elementMapper;
+    private OperationMapper operationMapper;
+    private FileMapper fileMapper;
 
     @Autowired
-    public void setOperationService(IOperationService operationService) {
-        this.operationService = operationService;
+    public void setMenuMapper(MenuMapper menuMapper) {
+        this.menuMapper = menuMapper;
     }
 
     @Autowired
-    public void setMenuService(IMenuService menuService) {
-        this.menuService = menuService;
+    public void setElementMapper(ElementMapper elementMapper) {
+        this.elementMapper = elementMapper;
     }
 
     @Autowired
-    public void setElementService(IElementService elementService) {
-        this.elementService = elementService;
+    public void setOperationMapper(OperationMapper operationMapper) {
+        this.operationMapper = operationMapper;
     }
 
     @Autowired
-    public void setFileService(IFileService fileService) {
-        this.fileService = fileService;
+    public void setFileMapper(FileMapper fileMapper) {
+        this.fileMapper = fileMapper;
     }
 
     @Override
     public PowerSet getAllPower() {
-        List<Operation> operationList = operationService.list();
-        List<Menu> menuList = menuService.list();
-        List<Element> elementList = elementService.list();
-        List<File> fileList = fileService.list();
+        List<Menu> menuList = menuMapper.selectList(Wrappers.emptyWrapper());
+        List<Element> elementList = elementMapper.selectList(Wrappers.emptyWrapper());
+        List<Operation> operationList = operationMapper.selectList(Wrappers.emptyWrapper());
+        List<File> fileList = fileMapper.selectList(Wrappers.emptyWrapper());
 
-        return new PowerSet(operationList, menuList, elementList, fileList);
+        return new PowerSet(menuList, elementList, operationList, fileList);
     }
 }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerTypeServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerTypeServiceImpl.java
deleted file mode 100644
index 44db610..0000000
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerTypeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.cfive.pinnacle.service.permission.impl;
-
-import com.cfive.pinnacle.entity.permission.PowerType;
-import com.cfive.pinnacle.mapper.permission.PowerTypeMapper;
-import com.cfive.pinnacle.service.permission.IPowerTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 权限类型 服务实现类
- * </p>
- *
- * @author FatttSnake
- * @since 2023-04-30
- */
-@Service
-public class PowerTypeServiceImpl extends ServiceImpl<PowerTypeMapper, PowerType> implements IPowerTypeService {
-
-}
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
similarity index 93%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleServiceImpl.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
index 29522df..2f1741e 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cfive.pinnacle.service.impl;
+package com.cfive.pinnacle.service.permission.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.Role;
+import com.cfive.pinnacle.entity.permission.Role;
 import com.cfive.pinnacle.entity.permission.PowerRole;
-import com.cfive.pinnacle.mapper.RoleMapper;
+import com.cfive.pinnacle.mapper.permission.RoleMapper;
 import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
-import com.cfive.pinnacle.service.IRoleService;
+import com.cfive.pinnacle.service.permission.IRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java
index eff6243..5adc3ca 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java
@@ -1,8 +1,8 @@
 package com.cfive.pinnacle.service.permission.impl;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.entity.permission.LoginUser;
-import com.cfive.pinnacle.service.IUserService;
+import com.cfive.pinnacle.service.permission.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.core.userdetails.UserDetails;
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
similarity index 91%
rename from Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserServiceImpl.java
rename to Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
index a4df008..066be4d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
@@ -1,15 +1,10 @@
-package com.cfive.pinnacle.service.impl;
+package com.cfive.pinnacle.service.permission.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cfive.pinnacle.entity.*;
-import com.cfive.pinnacle.entity.permission.Element;
-import com.cfive.pinnacle.entity.permission.Menu;
-import com.cfive.pinnacle.entity.permission.Operation;
-import com.cfive.pinnacle.mapper.*;
-import com.cfive.pinnacle.mapper.permission.ElementMapper;
-import com.cfive.pinnacle.mapper.permission.MenuMapper;
-import com.cfive.pinnacle.mapper.permission.OperationMapper;
-import com.cfive.pinnacle.service.IUserService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cfive.pinnacle.entity.permission.*;
+import com.cfive.pinnacle.mapper.permission.*;
+import com.cfive.pinnacle.service.permission.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,9 +99,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public User getUserWithPower(String username) {
         User user = userMapper.getOneWithPowerByUsername(username);
         if (user.getId() == 1L) {
-            List<Menu> menus = menuMapper.selectList(null);
-            List<Element> elements = elementMapper.selectList(null);
-            List<Operation> operations = operationMapper.selectList(null);
+            List<Menu> menus = menuMapper.selectList(Wrappers.emptyWrapper());
+            List<Element> elements = elementMapper.selectList(Wrappers.emptyWrapper());
+            List<Operation> operations = operationMapper.selectList(Wrappers.emptyWrapper());
             user.setMenus(menus);
             user.setElements(elements);
             user.setOperations(operations);
diff --git a/Pinnacle/src/main/resources/mapper/GroupMapper.xml b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
similarity index 97%
rename from Pinnacle/src/main/resources/mapper/GroupMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
index 32bb578..0c49316 100644
--- a/Pinnacle/src/main/resources/mapper/GroupMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.GroupMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.GroupMapper">
 
     <select id="getAll" resultMap="groupMap">
         select t_group.id      as group_id,
diff --git a/Pinnacle/src/main/resources/mapper/RoleGroupMapper.xml b/Pinnacle/src/main/resources/mapper/permission/RoleGroupMapper.xml
similarity index 68%
rename from Pinnacle/src/main/resources/mapper/RoleGroupMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/RoleGroupMapper.xml
index 8db0f09..6029169 100644
--- a/Pinnacle/src/main/resources/mapper/RoleGroupMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/RoleGroupMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.RoleGroupMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.RoleGroupMapper">
 
 </mapper>
diff --git a/Pinnacle/src/main/resources/mapper/RoleMapper.xml b/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
similarity index 98%
rename from Pinnacle/src/main/resources/mapper/RoleMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
index 7ddb7a3..2956544 100644
--- a/Pinnacle/src/main/resources/mapper/RoleMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.RoleMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.RoleMapper">
 
     <select id="getAll" resultMap="roleMap">
         select t_role.id      as role_id,
diff --git a/Pinnacle/src/main/resources/mapper/UserGroupMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserGroupMapper.xml
similarity index 68%
rename from Pinnacle/src/main/resources/mapper/UserGroupMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/UserGroupMapper.xml
index 6c666a6..b8d08a0 100644
--- a/Pinnacle/src/main/resources/mapper/UserGroupMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/UserGroupMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.UserGroupMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.UserGroupMapper">
 
 </mapper>
diff --git a/Pinnacle/src/main/resources/mapper/UserMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
similarity index 99%
rename from Pinnacle/src/main/resources/mapper/UserMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
index be4338d..fe7e775 100644
--- a/Pinnacle/src/main/resources/mapper/UserMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.UserMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper">
 
     <select id="getAll" resultMap="userMap">
         select t_user.id            as user_id,
diff --git a/Pinnacle/src/main/resources/mapper/UserRoleMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserRoleMapper.xml
similarity index 68%
rename from Pinnacle/src/main/resources/mapper/UserRoleMapper.xml
rename to Pinnacle/src/main/resources/mapper/permission/UserRoleMapper.xml
index 7573156..99b44db 100644
--- a/Pinnacle/src/main/resources/mapper/UserRoleMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/UserRoleMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cfive.pinnacle.mapper.UserRoleMapper">
+<mapper namespace="com.cfive.pinnacle.mapper.permission.UserRoleMapper">
 
 </mapper>
diff --git a/Pinnacle/src/test/java/com/cfive/pinnacle/notice/NoticeTest.java b/Pinnacle/src/test/java/com/cfive/pinnacle/notice/NoticeTest.java
index 60ed22f..16910b5 100644
--- a/Pinnacle/src/test/java/com/cfive/pinnacle/notice/NoticeTest.java
+++ b/Pinnacle/src/test/java/com/cfive/pinnacle/notice/NoticeTest.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cfive.pinnacle.controller.NoticeController;
 import com.cfive.pinnacle.entity.*;
 import com.cfive.pinnacle.entity.common.ResponseResult;
+import com.cfive.pinnacle.entity.permission.User;
 import com.cfive.pinnacle.mapper.NoticeMapper;
 import com.cfive.pinnacle.service.*;
+import com.cfive.pinnacle.service.permission.IUserService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/Pinnacle/src/test/java/com/cfive/pinnacle/service/IUserServiceTest.java b/Pinnacle/src/test/java/com/cfive/pinnacle/service/IUserServiceTest.java
index 9e048fc..1d0dcdc 100644
--- a/Pinnacle/src/test/java/com/cfive/pinnacle/service/IUserServiceTest.java
+++ b/Pinnacle/src/test/java/com/cfive/pinnacle/service/IUserServiceTest.java
@@ -1,6 +1,7 @@
 package com.cfive.pinnacle.service;
 
-import com.cfive.pinnacle.entity.User;
+import com.cfive.pinnacle.entity.permission.User;
+import com.cfive.pinnacle.service.permission.IUserService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;