调整系统管理,调整财务管理,添加工单需求

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDeptController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.cpop.core.base.entity.R;
 import com.cpop.oam.business.bo.DeptBo;
 import com.cpop.oam.business.bo.DeptListBo;
@@ -29,8 +30,9 @@ public class BackstageDeptController {
 
     /**
      * 查询部门树列表
+     *
      * @param bo 请求参数
-     * @return R<List<SysDeptVo>>
+     * @return {@link R }<{@link List }<{@link DeptVo }>>
      * @author DB
      * @since 2023/5/9 20:45
      */
@@ -43,25 +45,29 @@ public class BackstageDeptController {
 
     /**
      * 新增部门
+     *
      * @param bo 请求参数
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/9 20:47
      */
+    @SaCheckPermission("system.dept.insert")
     @Operation(summary = "新增部门")
     @PostMapping("/insertDept")
     public R<Void> insertDept(@Validated @RequestBody DeptBo bo) {
         deptService.insertDept(bo);
         return R.ok();
     }
-    
+
     /**
      * 修改部门
+     *
      * @param bo 请求参数
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/9 20:47
      */
+    @SaCheckPermission("system.dept.update")
     @Operation(summary = "修改部门")
     @PutMapping("/updateDept")
     public R<Void> updateDept(@Validated @RequestBody DeptBo bo) {
@@ -71,10 +77,13 @@ public class BackstageDeptController {
 
     /**
      * 删除部门
+     *
      * @param id 主键
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/9 20:48
      */
+    @SaCheckPermission("system.dept.remove")
     @Operation(summary = "删除部门")
     @DeleteMapping("/removeDept/{id}")
     public R<Void> removeDept(@PathVariable String id) {
@@ -82,6 +91,4 @@ public class BackstageDeptController {
         return R.ok();
     }
 
-
-
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictDataController.java

@@ -42,10 +42,11 @@ public class BackstageDictDataController {
 
     /**
      * 获取字典数据分页
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Page }<{@link DictDataPageVo }>>
      * @author DB
      * @since 2023/12/01
-     * @param bo 请求参数
-     * @return R<Page<DictData>>
      */
     @GetMapping("/getDictDataPage")
     @Operation(summary = "获取字典数据分页")
@@ -56,10 +57,11 @@ public class BackstageDictDataController {
 
     /**
      * 根据主键获取字典数据详情
+     *
+     * @param id 字典数据主键
+     * @return {@link R }<{@link DictDataVo }>
      * @author DB
      * @since 2023/12/01
-     * @param id 字典数据主键
-     * @return DictData
      */
     @GetMapping("/getDictDataInfo/{id}")
     @Operation(summary = "根据主键获取字典数据详情")
@@ -70,10 +72,11 @@ public class BackstageDictDataController {
 
     /**
      * 根据字典类型获取字典数据
+     *
+     * @param dictType 字典类型
+     * @return {@link R }<{@link List }<{@link DictDataListVo }>>
      * @author DB
      * @since 2023/12/01
-     * @param dictType 字典类型
-     * @return R<DictDataVo>
      */
     @GetMapping("/getDictDataByDictType/{dictType}")
     @Operation(summary = "根据字典类型获取字典数据")
@@ -84,10 +87,11 @@ public class BackstageDictDataController {
 
     /**
      * 新增字典数据
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
-     * @param bo 请求参数
-     * @return R<Void>
      */
     @PostMapping("/insertDictData")
     @Operation(summary = "新增字典数据")
@@ -98,10 +102,11 @@ public class BackstageDictDataController {
 
     /**
      * 修改字典数据
+     *
+     * @param bo 请求
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
-     * @param bo 请求
-     * @return R<Void>
      */
     @PutMapping("/updateDictData")
     @Operation(summary = "修改字典数据")
@@ -112,10 +117,11 @@ public class BackstageDictDataController {
 
     /**
      * 删除字典数据
+     *
+     * @param id 主键
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
-     * @param id 主键
-     * @return R<Void>
      */
     @DeleteMapping("/removeDictData/{id}")
     @Operation(summary = "删除字典数据")

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.cpop.core.base.entity.R;
@@ -48,10 +49,11 @@ public class BackstageDictTypeController {
      * 获取字典类型分页
      *
      * @param dictName 字典名
-     * @return R<Page<DictTypePageVo>>
+     * @return {@link R }<{@link Page }<{@link DictTypePageVo }>>
      * @author DB
      * @since 2023/12/01
      */
+    @SaCheckPermission("system.staff.list")
     @GetMapping("/getDictTypePage")
     @Operation(summary = "获取字典类型分页")
     public R<Page<DictTypePageVo>> getDictTypePage(@Parameter(description = "字典名") String dictName) {
@@ -63,7 +65,7 @@ public class BackstageDictTypeController {
      * 根据主键获取字典类型详情
      *
      * @param id 字典类型主键
-     * @return R<DictTypeVo>
+     * @return {@link R }<{@link DictTypeVo }>
      * @author DB
      * @since 2023/12/01
      */
@@ -78,7 +80,7 @@ public class BackstageDictTypeController {
      * 新增字典类型
      *
      * @param bo 请求参数
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
      */
@@ -98,7 +100,7 @@ public class BackstageDictTypeController {
      * 修改字典类型
      *
      * @param bo 请求
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
      */
@@ -116,7 +118,7 @@ public class BackstageDictTypeController {
      * 根据主键删除字典类型
      *
      * @param id 主键
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
      */
@@ -130,7 +132,7 @@ public class BackstageDictTypeController {
     /**
      * 刷新字典缓存
      *
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/01
      */
@@ -143,9 +145,10 @@ public class BackstageDictTypeController {
 
     /**
      * 获取字典选择框列表
+     *
+     * @return {@link R }<{@link List }<{@link DictTypeVo }>>
      * @author DB
      * @since 2023/12/01
-     * @return R<List<DictTypeVo>>
      */
     @Operation(summary = "获取字典选择框列表")
     @GetMapping("/optionSelect")

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageFinanceReimburseController.java

@@ -44,11 +44,12 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 财务报销模块-报销分页列表
+     *
      * @param bo 请求参数
-     * @return R<Page<FinanceReimbursePageVo>>
+     * @return {@link R }<{@link Page }<{@link FinanceReimbursePageVo }>>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Operation(summary = "财务报销模块-报销申请分页列表")
     @GetMapping("/getFinanceReimbursePage")
     public R<Page<FinanceReimbursePageVo>> getFinanceReimbursePage(FinanceReimbursePageBo bo) {
@@ -58,10 +59,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 财务报销模块-报销类型列表
-     * @return R<Page<FinanceReimbursePageVo>>
+     *
+     * @return {@link R }<{@link List }<{@link FinanceReimburseTypeListVo }>>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Operation(summary = "财务报销模块-报销类型列表")
     @GetMapping("/getFinanceReimburseTypeList")
     public R<List<FinanceReimburseTypeListVo>> getFinanceReimburseTypeList() {
@@ -71,10 +73,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 新增报销申请
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/21 15:55
-     * @param bo 请求参数
-     * @return com.pupu.core.base.R<java.lang.Void>
      */
     @Operation(summary = "新增报销申请")
     @PostMapping("/insertReimburseApplication")
@@ -85,10 +88,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 修改报销申请
+     *
+     * @param bo 请求
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/21
-     * @param bo 请求
-     * @return R<Void>
      */
     @Operation(summary = "修改报销申请")
     @PutMapping("/updateReimburseApplication")
@@ -99,11 +103,12 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 财务报销模块-报销审核分页列表
+     *
      * @param bo 请求参数
-     * @return R<Page<FinanceReimbursePageVo>>
+     * @return {@link R }<{@link Page }<{@link FinanceReimburseAuditPageVo }>>
      * @author DB
      * @since : 2023/5/30 15:44
-     **/
+     */
     @SaCheckPermission("financial.audit.list")
     @Operation(summary = "财务报销模块-报销审核分页列表")
     @GetMapping("/getReimburseAuditPage")
@@ -114,10 +119,12 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 修改报销状态
+     *
      * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/10 16:01
-     **/
+     */
     @Operation(summary = "修改报销状态")
     @PutMapping("/updateReimburseStatus")
     public R<Void> updateReimburseStatus(@RequestBody @Validated ReimburseStatusBo bo) {
@@ -127,10 +134,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 新增报销类型
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/21 15:55
-     * @param bo 请求参数
-     * @return com.pupu.core.base.R<java.lang.Void>
      */
     @Operation(summary = "新增报销类型")
     @PostMapping("/insertReimburseType")
@@ -141,10 +149,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 修改报销类型
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/08 15:20
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
     @Operation(summary = "修改报销类型")
     @PutMapping("/updateReimburseType")
@@ -155,10 +164,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 删除报销类型
+     *
+     * @param id 主键
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/12 16:57
-     * @param id 主键
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
     @Operation(summary = "删除报销类型")
     @DeleteMapping("/removeReimburseTypeById/{id}")
@@ -169,10 +179,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 财务报销模块-个人报销统计
-     * @return R<Page<FinanceReimbursePageVo>>
+     *
+     * @return {@link R }<{@link ReimbursePersonStatisticVo }>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Operation(summary = "财务报销模块-个人报销统计")
     @GetMapping("/getPersonStatistic")
     public R<ReimbursePersonStatisticVo> getPersonStatistic() {
@@ -181,9 +192,12 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 审核员工申请报销
+     *
+     * @param id id
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/10 16:01
-     **/
+     */
     @Operation(summary = "审核员工申请报销")
     @PutMapping("/auditReimburseApplication/{id}")
     public R<Void> auditReimburseApplication(@PathVariable String id) {
@@ -193,10 +207,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 报销驳回
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/08 15:20
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
     @Operation(summary = "报销驳回")
     @PutMapping("/reimburseReject")
@@ -211,10 +226,11 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 报销下款
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/08 15:20
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
     @Operation(summary = "报销下款")
     @PutMapping("/reimbursePay")
@@ -225,11 +241,12 @@ public class BackstageFinanceReimburseController {
 
     /**
      * 财务报销模块-报销分页列表
+     *
      * @param id 报销主键
-     * @return R<Page<FinanceReimbursePageVo>>
+     * @return {@link R }<{@link List }<{@link FinanceReimburseRecordListVo }>>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Operation(summary = "财务报销模块-报销详情记录列表")
     @GetMapping("/getReimburseRecordList/{id}")
     public R<List<FinanceReimburseRecordListVo>> getReimburseRecordList(@PathVariable String id) {

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageLoginController.java

@@ -13,16 +13,15 @@ import com.cpop.core.utils.ServletUtils;
 import com.cpop.core.utils.SpringUtils;
 import com.cpop.oam.business.bo.LoginForm;
 import com.cpop.oam.business.service.LoginService;
-import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
 import com.cpop.oam.business.vo.LoginUserInfoVo;
 import com.cpop.oam.business.vo.MenuRouteVo;
+import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author DB
@@ -101,8 +100,8 @@ public class BackstageLoginController {
      **/
     @Operation(summary = "获取权限码")
     @GetMapping("/getPermCode")
-    public R<Set<String>> getPermCode(){
+    public R<List<String>> getPermCode(){
-        Set<String> list = loginService.getPermCode();
+        List<String> list = loginService.getPermCode();
         return R.ok(list);
     }
 
@@ -114,7 +113,7 @@ public class BackstageLoginController {
     @Operation(summary = "获取菜单列表")
     @GetMapping("/getMenuList")
     public R<List<MenuRouteVo>> getMenuList(){
-        List<MenuRouteVo> list = loginService.getSysMenuList();
+        List<MenuRouteVo> list = loginService.getMenuList();
         return R.ok(list);
     }
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageMenuController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.cpop.core.base.entity.R;
 import com.cpop.oam.business.bo.MenuBo;
 import com.cpop.oam.business.bo.MenuListBo;
@@ -29,23 +30,26 @@ public class BackstageMenuController {
 
     /**
      * 获取系统菜单树列表
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link List }<{@link MenuVo }>>
      * @author DB
      * @since 2023/09/07 15:48
-     * @param bo 请求参数
-     * @return com.cpop.core.base.R<java.util.List<MenuVo>>
      */
+    @SaCheckPermission("system.menu.list")
     @Operation(summary = "获取系统菜单树列表")
-    @GetMapping("/getSysMenuTreeList")
+    @GetMapping("/getMenuTreeList")
-    public R<List<MenuVo>> getSysMenuTreeList(MenuListBo bo) {
+    public R<List<MenuVo>> getMenuTreeList(MenuListBo bo) {
-        List<MenuVo> list = menuService.getSysMenuTreeList(bo);
+        List<MenuVo> list = menuService.getMenuTreeList(bo);
         return R.ok(list);
     }
 
     /**
      * 获取目录与菜单树
+     *
+     * @return {@link R }<{@link List }<{@link MenuVo }>>
      * @author DB
      * @since 2023/09/07 17:41
-     * @return com.cpop.core.base.R<java.util.List<com.cpop.oam.business.vo.MenuVo>>
      */
     @Operation(summary = "获取目录与菜单树")
     @GetMapping("/getDirectoryAndMenuTreeList")
@@ -56,41 +60,47 @@ public class BackstageMenuController {
 
     /**
      * 新增菜单
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/07 17:45
-     * @param bo 请求参数
-     * @return com.cpop.core.base.R<java.lang.Void>
      */
     @Operation(summary = "新增菜单")
-    @PostMapping("/insertSysMenu")
+    @PostMapping("/insertMenu")
-    public R<Void> insertSysMenu(@RequestBody @Validated MenuBo bo) {
+    public R<Void> insertMenu(@RequestBody @Validated MenuBo bo) {
-        menuService.insertSysMenu(bo);
+        menuService.insertMenu(bo);
         return R.ok();
     }
 
     /**
      * 修改菜单
+     *
      * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/10 16:01
-     **/
+     */
     @Operation(summary = "修改菜单")
-    @PutMapping("/updateSysMenu")
+    @PutMapping("/updateMenu")
-    public R<Void> updateSysMenu(@RequestBody @Validated MenuBo bo) {
+    public R<Void> updateMenu(@RequestBody @Validated MenuBo bo) {
-        menuService.updateSysMenu(bo);
+        menuService.updateMenu(bo);
         return R.ok();
     }
 
     /**
      * 删除菜单
+     *
      * @param id 主键id
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/10 16:01
-     **/
+     */
+    @SaCheckPermission("system.menu.remove")
     @Operation(summary = "删除菜单")
-    @DeleteMapping("/removeSysMenu/{id}")
+    @DeleteMapping("/removeMenu/{id}")
-    public R<Void> removeSysMenu(@PathVariable String id) {
+    public R<Void> removeMenu(@PathVariable String id) {
-        menuService.removeSysMenu(id);
+        menuService.removeMenu(id);
         return R.ok();
     }
 

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageRoleController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.cpop.core.base.entity.R;
 import com.cpop.oam.business.bo.MenuListBo;
 import com.cpop.oam.business.bo.RoleBo;
@@ -37,86 +38,94 @@ public class BackstageRoleController {
 
     /**
      * 查询角色分页列表
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Page }<{@link RolePageVo }>>
      * @author DB
      * @since 2023/09/10 16:51
-     * @param bo 请求参数
-     * @return R<PageVo<SysRolePageVo>>
      */
+    @SaCheckPermission("system.role.list")
     @Operation(summary = "查询角色分页列表")
-    @GetMapping("/getSysRolePageList")
+    @GetMapping("/getRolePageList")
-    public R<Page<RolePageVo>> getSysRolePageList(RolePageBo bo) {
+    public R<Page<RolePageVo>> getRolePageList(RolePageBo bo) {
-        Page<RolePageVo> pageVo = roleService.getSysRolePage(bo);
+        Page<RolePageVo> pageVo = roleService.getRolePage(bo);
         return R.ok(pageVo);
     }
 
     /**
      * 新增角色
-     * @author DB
+     *
-     * @since  2023/10/12 10:48
      * @param bo 请求参数
-     * @return com.cpop.core.base.entity.R<java.lang.Void>
+     * @return {@link R }<{@link Void }>
+     * @author DB
+     * @since 2023/10/12 10:48
      */
     @Operation(summary = "新增角色")
-    @PostMapping("/insertSysRole")
+    @PostMapping("/insertRole")
-    public R<Void> insertSysRole(@RequestBody @Validated RoleBo bo) {
+    public R<Void> insertRole(@RequestBody @Validated RoleBo bo) {
-        roleService.insertSysRole(bo);
+        roleService.insertRole(bo);
         return R.ok();
     }
 
     /**
      * 获取系统菜单树列表
+     *
+     * @return {@link R }<{@link List }<{@link MenuVo }>>
      * @author DB
      * @since 2023/5/10 14:39
-     **/
+     */
     @Operation(summary = "获取菜单树列表")
-    @GetMapping("/getSysMenuTreeList")
+    @GetMapping("/getMenuTreeList")
-    public R<List<MenuVo>> getSysMenuTreeList() {
+    public R<List<MenuVo>> getMenuTreeList() {
         MenuListBo menuListBo = new MenuListBo();
         menuListBo.setStatus(true);
-        List<MenuVo> list = menuService.getSysMenuTreeList(menuListBo);
+        List<MenuVo> list = menuService.getMenuTreeList(menuListBo);
         //过滤掉没有权限的数据
         return R.ok(list);
     }
 
     /**
      * 修改角色
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/10 17:45
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
     @Operation(summary = "修改角色")
-    @PutMapping("/updateSysRole")
+    @PutMapping("/updateRole")
-    public R<Void> updateSysRole(@RequestBody @Validated RoleBo bo) {
+    public R<Void> updateRole(@RequestBody @Validated RoleBo bo) {
-        roleService.updateSysRole(bo);
+        roleService.updateRole(bo);
         return R.ok();
     }
 
     /**
      * 删除角色
+     *
+     * @param id 主键
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2024/4/17
-     * @param id 主键
-     * @return R<Void>
      */
     @Operation(summary = "删除角色")
-    @DeleteMapping("/removeSysRole/{id}")
+    @DeleteMapping("/removeRole/{id}")
-    public R<Void> removeSysRole(@PathVariable String id) {
+    public R<Void> removeRole(@PathVariable String id) {
-        roleService.removeSysRole(id);
+        roleService.removeRole(id);
         return R.ok();
     }
 
     /**
      * 设置角色状态
+     *
      * @param bo 请求参数
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/9 14:13
-     **/
+     */
     @Operation(description = "设置角色状态")
-    @PutMapping("/setSysRoleStatus")
+    @PutMapping("/setRoleStatus")
-    public R<Void> setSysRoleStatus(@RequestBody @Validated RoleStatusBo bo) {
+    public R<Void> setRoleStatus(@RequestBody @Validated RoleStatusBo bo) {
-        roleService.setSysRoleStatus(bo);
+        roleService.setRoleStatus(bo);
         return R.ok();
     }
 

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import com.cpop.core.base.entity.R;
 import com.cpop.core.utils.SpringUtils;
@@ -41,10 +42,11 @@ public class BackstageStaffController {
 
     /**
      * 查询员工分页列表
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Page }<{@link StaffPageVo }>>
      * @author DB
      * @since 2023/09/07 18:07
-     * @param bo 请求参数
-     * @return R<Page<SysStaffPageVo>>
      */
     @Operation(summary = "查询员工分页列表")
     @GetMapping("/getStaffPageList")
@@ -55,11 +57,13 @@ public class BackstageStaffController {
 
     /**
      * 新增员工
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/08 14:04
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
+    @SaCheckPermission("system.staff.insert")
     @Operation(summary = "新增员工")
     @PostMapping("/insertStaff")
     public R<Void> insertStaff(@RequestBody @Validated StaffBo bo) {
@@ -69,11 +73,13 @@ public class BackstageStaffController {
 
     /**
      * 修改员工
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/08 15:20
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
+    @SaCheckPermission("system.staff.update")
     @Operation(summary = "修改员工")
     @PutMapping("/updateStaff")
     public R<Void> updateStaff(@RequestBody @Validated StaffBo bo) {
@@ -83,11 +89,13 @@ public class BackstageStaffController {
 
     /**
      * 删除员工
+     *
+     * @param id 主键
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/09/12 16:57
-     * @param id 主键
-     * @return com.jambox.core.base.R<java.lang.Void>
      */
+    @SaCheckPermission("system.staff.remove")
     @Operation(summary = "删除员工")
     @DeleteMapping("/removeStaffById/{id}")
     public R<Void> removeStaffById(@PathVariable String id) {
@@ -97,10 +105,11 @@ public class BackstageStaffController {
 
     /**
      * 查询部门树列表
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link List }<{@link DeptVo }>>
      * @author DB
      * @since 2023/09/08 18:19
-     * @param bo 请求参数
-     * @return com.jambox.core.base.R<List<DeptVo>>
      */
     @Operation(summary = "查询部门树列表")
     @GetMapping("/getDeptTreeList")
@@ -108,8 +117,13 @@ public class BackstageStaffController {
         List<DeptVo> list = deptService.getDeptTreeList(bo);
         return R.ok(list);
     }
+
     /**
      * 获取所有角色信息
+     *
+     * @return {@link R }<{@link List }<{@link RoleVo }>>
+     * @author DB
+     * @since 2024/05/28
      */
     @Operation(summary = "获取所有角色信息")
     @GetMapping("/getAllRoleList")
@@ -125,12 +139,13 @@ public class BackstageStaffController {
 
     /**
      * 用户名是否存在
+     *
      * @param username 用户名
-     * @param id 主键
+     * @param id       主键
-     * @return R<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/11 10:09
-     **/
+     */
     @Operation(summary = "用户名是否存在")
     @GetMapping("/isAccountExist")
     public R<Void> isAccountExist(String username, String id) {
@@ -140,11 +155,13 @@ public class BackstageStaffController {
 
     /**
      * 获取员工信息
+     *
      * @param id 主键
-     * @return R<StaffVo>
+     * @return {@link R }<{@link StaffInfoVo }>
      * @author DB
      * @since 2023/5/17 10:33
-     **/
+     */
+    @SaCheckPermission("system.staff.info")
     @Operation(summary = "获取员工信息")
     @GetMapping("/getStaffInfo/{id}")
     public R<StaffInfoVo> getStaffInfo(@PathVariable String id) {
@@ -154,11 +171,12 @@ public class BackstageStaffController {
 
     /**
      * 获取用户操作日志分页
+     *
      * @param bo 请求参数
-     * @return R<PageVo<SysOperationLogVo>>
+     * @return {@link R }<{@link Page }<{@link OperationLogVo }>>
      * @author DB
      * @since 2023/5/12 14:30
-     **/
+     */
     @Operation(summary = "获取用户操作日志分页")
     @GetMapping("/getUserLogList")
     public R<Page<OperationLogVo>> getUserLogList(@Validated UserLogBo bo) {
@@ -168,11 +186,12 @@ public class BackstageStaffController {
 
     /**
      * 修改系统用户密码
+     *
      * @param bo 请求参数
-     * @return AjaxResult<Void>
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/12 16:00
-     **/
+     */
     @Operation(summary = "修改系统用户密码")
     @PutMapping("/modifyUserPassword")
     public R<Void> modifyUserPassword(@Validated @RequestBody ModifyUserPasswordBo bo) {
@@ -182,10 +201,11 @@ public class BackstageStaffController {
 
     /**
      * 修改运维状态
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/12/07
-     * @param bo 请求参数
-     * @return R<Void>
      */
     @Operation(summary = "修改运维状态")
     @PutMapping("/changeOperationStatus")

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysConfigController.java

@@ -1,8 +1,7 @@
 package com.cpop.oam.business.controller.backstage;
 
-import com.cpop.core.anno.OperationLog;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.cpop.core.base.entity.R;
-import com.cpop.core.base.enums.OperationLogEnum;
 import com.cpop.oam.business.bo.SysConfigInfoBo;
 import com.cpop.oam.business.service.CommonService;
 import com.cpop.oam.business.vo.ConfigInfoVo;
@@ -26,11 +25,13 @@ public class BackstageSysConfigController {
     private CommonService commonService;
 
     /**
-     * @Description: 获取系统配置信息
+     * 获取系统配置信息
-     * @return R<OpenPlatformConfigVo>
+     *
+     * @return {@link R }<{@link ConfigInfoVo }>
      * @author DB
-     * @Date: 2023/7/7 0007 16:27
+     * @since 2023/7/7 0007 16:27
      */
+    @SaCheckPermission("system.config.list")
     @Operation(summary = "获取系统配置信息")
     @GetMapping("/getSysConfigInfo")
     public R<ConfigInfoVo> getSysConfigInfo() {
@@ -39,11 +40,13 @@ public class BackstageSysConfigController {
     }
 
     /**
-     * @param bo 请求参数
      * 设置系统配置信息
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/11 15:48
-     **/
+     */
     @Operation(summary = "设置系统配置信息")
     @PutMapping("/setSysConfigInfo")
     public R<Void> setSysConfigInfo(@RequestBody @Validated SysConfigInfoBo bo) {

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageTaskWorkOrderController.java

@@ -1,5 +1,6 @@
 package com.cpop.oam.business.controller.backstage;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.cpop.core.base.entity.R;
 import com.cpop.oam.business.bo.AgreeOrRejectEnforceFinishBo;
 import com.cpop.oam.business.bo.PauseWorkOrderBo;
@@ -40,9 +41,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-接收/处理/暂停中
+     *
+     * @return {@link R }<{@link TaskWorkOrderReceiveDealPauseVo }>
      * @author DB
      * @since 2023/09/18 17:18
-     * @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.TaskWorkOrderPageVo>>
      */
     @Operation(summary = "工单模块-工单提交-接收/处理/暂停中")
     @GetMapping("/receiveDealPause")
@@ -53,6 +55,8 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-获取当天值班人员
+     *
+     * @return {@link R }<{@link WorkOrderDutyVo }>
      * @author DB
      * @since 2023-11-29 14:01:03
      */
@@ -65,6 +69,8 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-已办结分页列表
+     *
+     * @return {@link R }<{@link Page }<{@link TaskWorkOrderPageVo }>>
      * @author DB
      * @since 2023-11-29 14:35:08
      */
@@ -77,11 +83,12 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-新增工单
-     * @param bo 请求参数         
+     *
-     * @return R<Void>
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2023/5/30 16:53
-     **/
+     */
     @Operation(summary = "工单模块-工单提交-新增工单")
     @PostMapping("/insertWorkOrder")
     public R<Void> insertWorkOrder(@RequestBody @Validated TaskWorkOrderBo bo) {
@@ -91,10 +98,13 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-工单记录列表
-     * @author DB
+     *
      * @param workOrderId 工单id
+     * @return {@link R }<{@link List }<{@link TaskWorkOrderRecordListVo }>>
+     * @author DB
      * @since 2023-11-29 11:25:28
      */
+    @SaCheckPermission("workDemand:workOrder:list")
     @Operation(summary = "工单模块-工单提交-工单记录列表")
     @GetMapping("/getWorkOrderRecordList/{workOrderId}")
     public R<List<TaskWorkOrderRecordListVo>> getWorkOrderRecordList(@PathVariable @Parameter(description ="工单id") String workOrderId) {
@@ -104,8 +114,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-新增工单记录
-     * @author DB
+     *
      * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
+     * @author DB
      * @since 2023-11-29 11:33:35
      */
     @Operation(summary = "工单模块-工单提交-新增工单记录")
@@ -117,8 +129,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-工单提醒
-     * @author DB
+     *
      * @param workOrderId 工单id
+     * @return {@link R }<{@link Void }>
+     * @author DB
      * @since 2023-11-29 11:41:46
      */
     @Operation(summary = "工单模块-工单提交-工单提醒")
@@ -130,8 +144,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-工单转需求
-     * @author DB
+     *
      * @param workOrderId 工单id
+     * @return {@link R }<{@link Void }>
+     * @author DB
      * @since 2023-11-29 12:30:21
      */
     @Operation(summary = "工单模块-工单提交-工单转需求")
@@ -143,8 +159,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-工单暂停
-     * @author DB
+     *
      * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
+     * @author DB
      * @since 2023-11-29 16:00:18
      */
     @Operation(summary = "工单模块-工单提交-工单暂停")
@@ -156,8 +174,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-工单办结
-     * @author DB
+     *
      * @param workOrderId 工单id
+     * @return {@link R }<{@link Void }>
+     * @author DB
      * @since 2023-11-29 15:44:08
      */
     @Operation(summary = "工单模块-工单提交-工单办结")
@@ -169,8 +189,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 任务管理模块-工单管理-获取品牌列表
-     * @author DB
+     *
      * @param brandName 品牌名
+     * @return {@link R }<{@link List }<{@link BrandListVo }>>
+     * @author DB
      * @since 2023-11-30 17:59:29
      */
     @Operation(summary = "工单模块-工单提交-获取品牌列表")
@@ -189,8 +211,10 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单模块-工单提交-获取校区/店铺列表
-     * @author DB
+     *
      * @param brandId 品牌id
+     * @return {@link R }<{@link List }<{@link StoreListVo }>>
+     * @author DB
      * @since 2023-11-30 18:00:08
      */
     @Operation(summary = "工单模块-工单提交-获取校区/店铺列表")
@@ -209,12 +233,13 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 工单统计-获取工单统计分页
+     *
+     * @param staffId   员工id
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return {@link R }<{@link Page }<{@link TaskWorkOrderStatPageVo }>>
      * @author DB
      * @since 2024/1/31
-     * @param staffId 员工id
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return R<Page<TaskWorkOrderPageVo>>
      */
     @Operation(summary = "工单统计-获取工单统计分页")
     @GetMapping("/getWorkOrderStatPage")
@@ -227,10 +252,11 @@ public class BackstageTaskWorkOrderController {
 
     /**
      * 同意与拒绝强制办结
+     *
+     * @param bo 请求参数
+     * @return {@link R }<{@link Void }>
      * @author DB
      * @since 2024/2/21
-     * @param bo 请求参数
-     * @return R<Void>
      */
     @Operation(summary = "工单模块-工单提交-同意与拒绝强制办结")
     @PutMapping("/agreeOrRejectEnforceFinish")

Cpop-Oam/src/main/java/com/cpop/oam/business/service/CommonService.java

@@ -10,46 +10,53 @@ public interface CommonService {
 
     /**
      * 加载参数缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     void loadingConfigCache();
 
     /**
-     * @Description: 重置参数缓存数据
+     * 重置配置缓存
+     *
      * @author DB
-     * @Date: 2023/6/7 0007 16:29
+     * @since 2024/05/28
      */
     void resetConfigCache();
 
     /**
-     * @Description: 清空参数缓存数据
+     * 清除配置缓存
+     *
      * @author DB
-     * @Date: 2023/6/7 0007 16:27
+     * @since 2024/05/28
      */
     void clearConfigCache();
 
     /**
-     * @Description: 获取系统配置信息
+     * 获取系统配置信息
+     *
      * @return R<OpenPlatformConfigVo>
      * @author DB
-     * @Date: 2023/7/7 0007 16:27
+     * @since 2024/05/28
      */
     ConfigInfoVo getSysConfigInfo();
 
     /**
+     * 设置系统配置信息
+     *
      * @param bo 请求参数
-     * @Description: 设置系统配置信息
+     * @author DB
-     * @return: R<Void>
+     * @since 2024/05/28
-     * @Author: DB
+     */
-     * @Date: 2023/5/11 15:48
-     **/
     void setSysConfigInfo(SysConfigInfoBo bo);
 
     /**
      * 获取缓存key
+     *
+     * @param key 枚举key
+     * @return {@link String }
      * @author DB
      * @since 2023/12/26
-     * @param key 枚举key
-     * @return String
      */
     String getCacheKey(String key);
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/DeptService.java

@@ -17,11 +17,12 @@ import java.util.List;
 public interface DeptService extends IService<Dept> {
 
     /**
-     * @descriptions 查询部门树列表
+     * 查询部门树列表
-     * @author DB
+     *
-     * @date 2023/09/08 18:25
      * @param bo 查询参数
-     * @return java.util.List<com.jambox.system.business.vo.DeptVo>
+     * @return {@link List }<{@link DeptVo }>
+     * @author DB
+     * @since 2023/09/08 18:25
      */
     List<DeptVo> getDeptTreeList(DeptListBo bo);
 
@@ -29,22 +30,24 @@ public interface DeptService extends IService<Dept> {
      * 新增部门
      *
      * @param bo 请求参数
+     * @author DB
+     * @since 2024/05/28
      */
     void insertDept(DeptBo bo);
 
     /**
-     * @Description: 修改部门
+     * 修改部门
      * @param bo 请求参数
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:47
+     * @since 2023/5/9 20:47
      */
     void updateDept(DeptBo bo);
 
     /**
-     * @Description: 删除部门
+     * 删除部门
      * @param id 主键
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:48
+     * @since 2023/5/9 20:48
      */
     void removeDept(String id);
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictDataService.java

@@ -20,28 +20,31 @@ public interface DictDataService extends IService<DictData> {
 
     /**
      * 获取字典数据分页
+     *
+     * @param bo 请求参数
+     * @return {@link Page }<{@link DictDataPageVo }>
      * @author DB
      * @since 2023/12/01
-     * @param bo 请求参数
-     * @return Page<DictDataPageVo>
      */
     Page<DictDataPageVo> getDictDataPage(DictDataPageBo bo);
 
     /**
      * 根据主键获取字典数据详情
+     *
+     * @param id 主键
+     * @return {@link DictDataVo }
      * @author DB
      * @since 2023/12/01
-     * @param id 主键
-     * @return DictDataVo
      */
     DictDataVo getDictDataInfo(String id);
 
     /**
      * 根据字典类型获取字典数据
+     *
+     * @param dictType 字典类型
+     * @return {@link List }<{@link DictData }>
      * @author DB
      * @since 2023/12/01
-     * @param dictType 字典类型
-     * @return List<DictDataVo>
      */
     List<DictData> getDictDataByDictType(String dictType);
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictTypeService.java

@@ -16,19 +16,21 @@ public interface DictTypeService extends IService<DictType> {
 
     /**
      * 获取系统字典类型分页
+     *
+     * @param dictName 字典名
+     * @return {@link Page }<{@link DictTypePageVo }>
      * @author DB
      * @since 2023/12/01
-     * @param dictName 字典名
-     * @return R<Page<DictTypePageVo>>
      */
     Page<DictTypePageVo> getDictTypePage(String dictName);
 
     /**
      * 查询系统类型是否存在
+     *
+     * @param bo 请求参数
+     * @return {@link Boolean }
      * @author DB
      * @since 2023/12/01
-     * @param bo 请求参数
-     * @return boolean
      */
     Boolean checkDictTypeUnique(DictTypeBo bo);
 
@@ -42,6 +44,7 @@ public interface DictTypeService extends IService<DictType> {
 
     /**
      * 重设字典
+     *
      * @author DB
      * @since 2023/12/01
      */

Cpop-Oam/src/main/java/com/cpop/oam/business/service/FinanceReimburseService.java

@@ -17,37 +17,40 @@ import com.cpop.oam.business.vo.ReimbursePersonStatisticVo;
 public interface FinanceReimburseService extends IService<FinanceReimburse> {
 
     /**
-     * @Description: 财务报销模块-报销分页列表
+     * 财务报销模块-报销分页列表
+     *
      * @param bo 请求参数
-     * @return: R<Page<FinanceReimbursePageVo>>
+     * @return {@link Page }<{@link FinanceReimbursePageVo }>
-     * @Author: DB
+     * @author DB
-     * @Date: 2023/5/30 15:44
+     * @since 2023/5/30 15:44
-     **/
+     */
     Page<FinanceReimbursePageVo> getFinanceReimbursePage(FinanceReimbursePageBo bo);
 
     /**
-     * @Description: 财务报销模块-报销审核分页列表
+     * 获得报销审核页面
+     *
      * @param bo 请求参数
-     * @return: R<Page<FinanceReimbursePageVo>>
+     * @return {@link Page }<{@link FinanceReimburseAuditPageVo }>
-     * @Author: DB
+     * @author DB
-     * @Date: 2023/5/30 15:44
+     * @since 2024/05/28
-     **/
+     */
     Page<FinanceReimburseAuditPageVo> getReimburseAuditPage(FinanceReimburseAuditPageBo bo);
 
     /**
-     * @Description: 修改报销状态
+     * 更新报销状态
+     *
      * @param bo 请求参数
-     * @Author: DB
+     * @author DB
-     * @Date: 2023/5/10 16:01
+     * @since 2024/05/28
-     **/
+     */
     void updateReimburseStatus(ReimburseStatusBo bo);
 
     /**
-     * @descriptions 新增报销申请
+     * 插入报销申请
-     * @author DB
+     *
-     * @date 2023/09/21 15:55
      * @param bo 请求参数
-     * @return: com.cpop.core.base.entity.R<java.lang.Void>
+     * @author DB
+     * @since 2024/05/28
      */
     void insertReimburseApplication(ReimburseApplicationBo bo);
 
@@ -60,19 +63,20 @@ public interface FinanceReimburseService extends IService<FinanceReimburse> {
     void updateReimburseApplication(ReimburseApplicationBo bo);
 
     /**
-     * @Description: 财务报销模块-个人报销统计
+     * 获取人员统计信息
-     * @return: R<Page<FinanceReimbursePageVo>>
+     *
-     * @Author: DB
+     * @return {@link ReimbursePersonStatisticVo }
-     * @Date: 2023/5/30 15:44
+     * @author DB
-     **/
+     * @since 2024/05/28
+     */
     ReimbursePersonStatisticVo getPersonStatistic();
 
     /**
-     * @descriptions 报销下款
+     * 报销支付
-     * @author DB
+     *
-     * @date 2023/09/08 15:20
      * @param bo 请求参数
-     * @return: com.jambox.core.base.R<java.lang.Void>
+     * @author DB
+     * @since 2024/05/28
      */
     void reimbursePay(ReimbursePayBo bo);
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/LoginService.java

@@ -1,12 +1,11 @@
 package com.cpop.oam.business.service;
 
 import com.cpop.oam.business.bo.LoginForm;
-import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
 import com.cpop.oam.business.vo.LoginUserInfoVo;
 import com.cpop.oam.business.vo.MenuRouteVo;
+import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 系统登陆
@@ -32,16 +31,21 @@ public interface LoginService {
 
     /**
      * 获取权限码
+     *
+     * @return {@link List }<{@link String }>
+     * @author DB
+     * @since 2023-11-30 14:32:57
      */
-    Set<String> getPermCode();
+    List<String> getPermCode();
 
     /**
-     * @Description: 获取菜单列表
+     * 获取菜单列表
-     * @return: List<SysMenuRouteVo>
+     *
-     * @Author: DB
+     * @return {@link List }<{@link MenuRouteVo }>
-     * @Date: 2023/5/11 9:16
+     * @author DB
-     **/
+     * @since 2023/5/11 9:16
-    List<MenuRouteVo> getSysMenuList();
+     */
+    List<MenuRouteVo> getMenuList();
 
 
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java

@@ -20,21 +20,27 @@ public interface MenuService extends IService<Menu> {
 
     /**
      * 获取菜单路由
+     *
+     * @return {@link List }<{@link MenuRouteVo }>
      * @author DB
      * @since 2023/10/19 16:32
      */
-    List<MenuRouteVo> getSysMenuList();
+    List<MenuRouteVo> getMenuList();
 
     /**
      * 获取系统菜单树列表
+     *
+     * @param bo 请求参数
+     * @return {@link List }<{@link MenuVo }>
      * @author DB
      * @since 2023/09/07 15:53
-     * @param bo 请求参数
      */
-    List<MenuVo> getSysMenuTreeList(MenuListBo bo);
+    List<MenuVo> getMenuTreeList(MenuListBo bo);
 
     /**
      * 获取目录与菜单树
+     *
+     * @return {@link List }<{@link MenuVo }>
      * @author DB
      * @since 2023/09/07 17:42
      */
@@ -42,11 +48,12 @@ public interface MenuService extends IService<Menu> {
 
     /**
      * 新增菜单
+     *
+     * @param bo 请求参数
      * @author DB
      * @since 2023/09/07 17:50
-     * @param bo 请求参数
      */
-    void insertSysMenu(MenuBo bo);
+    void insertMenu(MenuBo bo);
 
     /**
      * 修改菜单
@@ -54,7 +61,7 @@ public interface MenuService extends IService<Menu> {
      * @author DB
      * @since 2023/5/10 16:01
      **/
-    void updateSysMenu(MenuBo bo);
+    void updateMenu(MenuBo bo);
 
     /**
      * 删除菜单
@@ -62,5 +69,5 @@ public interface MenuService extends IService<Menu> {
      * @author DB
      * @since 2023/5/10 16:01
      **/
-    void removeSysMenu(String id);
+    void removeMenu(String id);
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleService.java

@@ -18,28 +18,31 @@ public interface RoleService extends IService<Role> {
 
     /**
      * 查询角色分页列表
+     *
+     * @param bo 请求参数
+     * @return {@link Page }<{@link RolePageVo }>
      * @author DB
      * @since 2023/09/10 16:51
-     * @param bo 请求参数
-     * @return R<PageVo<SysRolePageVo>>
      */
-    Page<RolePageVo> getSysRolePage(RolePageBo bo);
+    Page<RolePageVo> getRolePage(RolePageBo bo);
 
     /**
      * 新增角色
-     * @author DB
+     *
-     * @since  2023/10/12 10:48
      * @param bo 请求参数
+     * @author DB
+     * @since 2023/10/12 10:48
      */
-    void insertSysRole(RoleBo bo);
+    void insertRole(RoleBo bo);
 
     /**
      * 修改角色
+     *
+     * @param bo 请求参数
      * @author DB
      * @since 2023/09/10 17:45
-     * @param bo 请求参数
      */
-    void updateSysRole(RoleBo bo);
+    void updateRole(RoleBo bo);
 
     /**
      * 删除角色
@@ -47,7 +50,7 @@ public interface RoleService extends IService<Role> {
      * @since 2024/4/17
      * @param id 主键
      */
-    void removeSysRole(String id);
+    void removeRole(String id);
 
     /**
      * 设置角色状态
@@ -55,6 +58,6 @@ public interface RoleService extends IService<Role> {
      * @author DB
      * @since 2023/5/9 14:13
      **/
-    void setSysRoleStatus(RoleStatusBo bo);
+    void setRoleStatus(RoleStatusBo bo);
 
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/StaffService.java

@@ -22,88 +22,93 @@ public interface StaffService extends IService<Staff> {
 
 
     /**
-     * @descriptions 查询员工分页列表
+     * 查询员工分页列表
-     * @author DB
+     *
-     * @date 2023/09/07 18:11
      * @param bo 请求参数
-     * @return com.mybatisflex.core.paginate.Page<com.jambox.system.business.vo.SysStaffPageVo>
+     * @return {@link Page }<{@link StaffPageVo }>
+     * @author DB
+     * @since 2023/09/07 18:11
      */
     Page<StaffPageVo> getStaffPageList(StaffPageBo bo);
 
     /**
-     * @descriptions 新增员工
+     * 新增员工
-     * @author DB
+     *
-     * @date 2023/09/08 14:12
      * @param bo 请求参数
+     * @return {@link User }
+     * @author DB
+     * @since 2023/09/08 14:12
      */
     User insertStaff(StaffBo bo);
 
     /**
-     * @descriptions 修改员工
+     * 修改员工
      * @author DB
-     * @date 2023/09/08 15:21
+     * @since 2023/09/08 15:21
      * @param bo 请求参数
      */
     void updateStaff(StaffBo bo);
 
     /**
-     * @descriptions 删除员工
+     * 删除员工
      * @author DB
-     * @date 2023/09/08 17:43
+     * @since 2023/09/08 17:43
      * @param id 主键
      */
     void removeStaffById(String id);
 
     /**
-     * @Description: 用户名是否存在
+     * 用户名是否存在
      * @param username 用户名
      * @param id 主键
-     * @return: R<Void>
+     * @author DB
-     * @Author: DB
+     * @since  2023/5/11 10:09
-     * @Date: 2023/5/11 10:09
      **/
     void isAccountExist(String username, String id);
 
     /**
-     * @Description: 获取员工信息
+     * 获取员工信息
+     *
      * @param id 主键
-     * @return: StaffInfoVo
+     * @return {@link StaffInfoVo }
-     * @Author: DB
+     * @author DB
-     * @Date: 2023/5/17 10:36
+     * @since 2023/5/17 10:36
-     **/
+     */
     StaffInfoVo getStaffInfo(String id);
 
     /**
-     * @Description: 获取用户操作日志分页
+     * 获取用户操作日志分页
+     *
      * @param bo 请求参数
-     * @return: R<PageVo<SysOperationLogVo>>
+     * @return {@link Page }<{@link OperationLogVo }>
-     * @Author: DB
+     * @author DB
-     * @Date: 2023/5/12 14:30
+     * @since 2023/5/12 14:30
-     **/
+     */
     Page<OperationLogVo> getUserLogList(UserLogBo bo);
 
     /**
-     * @Description: 修改系统用户密码
+     * 修改系统用户密码
      * @param bo 请求参数
-     * @return: AjaxResult<Void>
+     * @author DB
-     * @Author: DB
+     * @since 2023/5/12 16:00
-     * @Date: 2023/5/12 16:00
      **/
     void modifyUserPassword(ModifyUserPasswordBo bo);
 
     /**
-     * @Description: 查询服务员工列表
+     * 查询服务员工列表
-     * @return: R<List<OamStaffVo>>
+     *
-     * @Author: DB
+     * @return {@link List }<{@link StaffVo }>
-     * @Date: 2023/5/11 17:49
+     * @author DB
-     **/
+     * @since 2023/5/11 17:49
+     */
     List<StaffVo> getServiceStaffList();
 
     /**
      * 技术模块-今日事务-查询技术员工列表
+     *
+     * @return {@link List }<{@link StaffVo }>
      * @author DB
      * @since 2023/12/04
-     * @return List<StaffVo>
      */
     List<StaffVo> getTechnologyStaffList();
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/TaskWorkOrderService.java

@@ -19,14 +19,17 @@ public interface TaskWorkOrderService extends IService<TaskWorkOrder> {
 
     /**
      * 工单模块-工单提交-接收/处理/暂停中
+     *
+     * @return {@link TaskWorkOrderReceiveDealPauseVo }
      * @author DB
      * @since 2023/09/18 17:18
-     * @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page<com.cpop.oam.business.vo.TaskWorkOrderPageVo>>
      */
     TaskWorkOrderReceiveDealPauseVo receiveDealPause();
 
     /**
      * 工单模块-工单提交-获取当天值班人员
+     *
+     * @return {@link WorkOrderDutyVo }
      * @author DB
      * @since 2023-11-29 14:01:03
      */
@@ -34,6 +37,8 @@ public interface TaskWorkOrderService extends IService<TaskWorkOrder> {
 
     /**
      * 工单模块-工单提交-已办结分页列表
+     *
+     * @return {@link Page }<{@link TaskWorkOrderPageVo }>
      * @author DB
      * @since 2023-11-29 14:35:08
      */
@@ -41,16 +46,19 @@ public interface TaskWorkOrderService extends IService<TaskWorkOrder> {
 
     /**
      * 工单模块-工单提交-新增工单
-     * @param bo 请求参数         
+     *
+     * @param bo 请求参数
      * @author DB
      * @since 2023/5/30 16:53
-     **/
+     */
     void insertWorkOrder(TaskWorkOrderBo bo);
 
     /**
      * 工单模块-工单提交-工单记录列表
-     * @author DB
+     *
      * @param workOrderId 工单id
+     * @return {@link List }<{@link TaskWorkOrderRecordListVo }>
+     * @author DB
      * @since 2023-11-29 11:25:28
      */
     List<TaskWorkOrderRecordListVo> getWorkOrderRecordList(String workOrderId);
@@ -97,6 +105,8 @@ public interface TaskWorkOrderService extends IService<TaskWorkOrder> {
 
     /**
      * 技术模块-技术-获取个人工单列表
+     *
+     * @return {@link List }<{@link TaskWorkOrderPersonVo }>
      * @author DB
      * @since 2023-11-30 19:41:32
      */
@@ -112,12 +122,13 @@ public interface TaskWorkOrderService extends IService<TaskWorkOrder> {
 
     /**
      * 工单统计-获取工单统计分页
+     *
+     * @param staffId   员工id
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return {@link Page }<{@link TaskWorkOrderStatPageVo }>
      * @author DB
      * @since 2024/1/31
-     * @param staffId 员工id
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return R<Page<TaskWorkOrderPageVo>>
      */
     Page<TaskWorkOrderStatPageVo> getWorkOrderStatPage(String staffId,LocalDate startDate,LocalDate endDate);
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/AuthorityPermissionService.java

@@ -0,0 +1,71 @@
+package com.cpop.oam.business.service.impl;
+
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpInterface;
+import cn.dev33.satoken.stp.StpUtil;
+import com.cpop.core.constant.Constants;
+import com.cpop.core.utils.SpringUtils;
+import com.cpop.oam.business.entity.Menu;
+import com.cpop.oam.business.entity.table.MenuTableDef;
+import com.cpop.oam.business.service.MenuService;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU;
+import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
+
+/**
+ * 自定义权限加载接口实现类
+ * @author DB
+ * @since 2022-10-20 15:15
+ */
+@Component
+public class AuthorityPermissionService implements StpInterface {
+
+    /**
+     * 获取权限列表
+     * @author DB
+     * @since 2024/3/20
+     * @param loginId 登录id
+     * @param loginType 登录类型
+     * @return List<String>
+     */
+    @Override
+    public List<String> getPermissionList(Object loginId, String loginType) {
+        //获取权限
+        if (Constants.SUPER_ADMIN_ID.equals(loginId)) {
+            List<String> permissionSet = new ArrayList<>();
+            permissionSet.add(Constants.ALL_PERMISSION);
+            return permissionSet;
+        } else {
+            SaSession session = StpUtil.getSession();
+            List<Menu> menuPermissions = SpringUtils.getBean(MenuService.class)
+                    .queryChain()
+                    .select(MenuTableDef.MENU.PERMISSION)
+                    .leftJoin(ROLE_MENU)
+                    .on(ROLE_MENU.MENU_ID.eq(MenuTableDef.MENU.ID))
+                    .leftJoin(ROLE)
+                    .on(ROLE.ID.eq(ROLE_MENU.ROLE_ID))
+                    .where(ROLE.ID.eq(session.getString("roleId")))
+                    .and(MenuTableDef.MENU.TYPE.in(1, 2))
+                    .and(MenuTableDef.MENU.PERMISSION.isNotNull())
+                    .list();
+            return menuPermissions.stream().map(Menu::getPermission).toList();
+        }
+    }
+
+    /**
+     * 返回一个账号所拥有的角色标识集合 (权限与角色可分开校验)
+     * @author DB
+     * @since 2024/3/20
+     * @param loginId 登录id
+     * @param loginType 登录类型
+     * @return List<String>
+     */
+    @Override
+    public List<String> getRoleList(Object loginId, String loginType) {
+        return null;
+    }
+}

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/CommonServiceImpl.java

@@ -26,11 +26,14 @@ import static com.cpop.core.base.table.table.ConfigTableDef.CONFIG;
  * @author DB
  * @since 2023/09/13 12:45
  */
-@Service("oamCommonService")
+@Service("commonService")
 public class CommonServiceImpl implements CommonService {
 
     /**
      * 项目启动时，初始化参数到缓存
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @PostConstruct
     private void init() {
@@ -39,6 +42,9 @@ public class CommonServiceImpl implements CommonService {
 
     /**
      * 加载参数缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void loadingConfigCache() {
@@ -62,6 +68,9 @@ public class CommonServiceImpl implements CommonService {
 
     /**
      * 重置参数缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void resetConfigCache() {
@@ -71,6 +80,9 @@ public class CommonServiceImpl implements CommonService {
 
     /**
      * 清空参数缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void clearConfigCache() {
@@ -84,6 +96,8 @@ public class CommonServiceImpl implements CommonService {
      *
      * @param configKey 参数键
      * @return 缓存键key
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public String getCacheKey(String configKey) {
@@ -92,7 +106,8 @@ public class CommonServiceImpl implements CommonService {
 
     /**
      * 获取系统配置信息
-     * @return R<OpenPlatformConfigVo>
+     *
+     * @return {@link ConfigInfoVo }
      * @author DB
      * @since 2023/7/7 0007 16:27
      */
@@ -122,11 +137,12 @@ public class CommonServiceImpl implements CommonService {
     }
 
     /**
-     * @param bo 请求参数
      * 设置系统配置信息
+     *
+     * @param bo 请求参数
      * @author DB
      * @since 2023/5/11 15:48
-     **/
+     */
     @Override
     public void setSysConfigInfo(SysConfigInfoBo bo) {
         ConfigService configService = SpringUtils.getBean(ConfigService.class);

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DeptServiceImpl.java

@@ -32,11 +32,12 @@ import static com.cpop.oam.business.entity.table.StaffMidDeptTableDef.STAFF_MID_
 public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
 
     /**
-     * @descriptions 查询部门树列表
+     * 查询部门树列表
-     * @author DB
+     *
-     * @date 2023/09/08 18:25
      * @param bo 查询参数
-     * @return java.util.List<com.jambox.system.business.vo.DeptVo>
+     * @return {@link List }<{@link DeptVo }>
+     * @author DB
+     * @since 2023/09/08 18:25
      */
     @Override
     public List<DeptVo> getDeptTreeList(DeptListBo bo) {
@@ -47,11 +48,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 构建部门树
+     * 构建部门树
+     *
      * @param list 部门集合
-     * @return List<SysDeptVo>
+     * @return {@link List }<{@link DeptVo }>
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:56
+     * @since 2023/5/9 20:56
      */
     private List<DeptVo> buildDeptTree(List<DeptVo> list) {
         List<DeptVo> returnList = new ArrayList<DeptVo>();
@@ -73,11 +75,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 递归列表
+     * 递归列表
      * @param list 部门集合
      * @param t 参数
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:55
+     * @since 2023/5/9 20:55
      */
     private void recursionFn(List<DeptVo> list, DeptVo t) {
         // 得到子节点列表
@@ -91,24 +93,26 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 得到子节点列表
+     * 得到子节点列表
+     *
      * @param list 部门集合
-     * @param t 参数
+     * @param t    参数
-     * @return boolean
+     * @return {@link Boolean }
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:55
+     * @since 2023/5/9 20:55
      */
-    private boolean hasChild(List<DeptVo> list, DeptVo t) {
+    private Boolean hasChild(List<DeptVo> list, DeptVo t) {
         return !getChildList(list, t).isEmpty();
     }
 
     /**
-     * @Description: 得到子节点列表
+     * 得到子节点列表
+     *
      * @param list 部门集合
-     * @param t 参数
+     * @param t    参数
-     * @return List<SysDeptVo>
+     * @return {@link List }<{@link DeptVo }>
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:55
+     * @since 2023/5/9 20:55
      */
     private List<DeptVo> getChildList(List<DeptVo> list, DeptVo t) {
         List<DeptVo> tList = new ArrayList<DeptVo>();
@@ -124,6 +128,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
      * 新增部门
      *
      * @param bo 请求参数
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void insertDept(DeptBo bo) {
@@ -132,10 +138,10 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 修改部门
+     * 修改部门
      * @param bo 请求参数
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:47
+     * @since 2023/5/9 20:47
      */
     @Override
     public void updateDept(DeptBo bo) {
@@ -144,10 +150,10 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 删除部门
+     * 删除部门
      * @param id 主键
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:48
+     * @since 2023/5/9 20:48
      */
     @Override
     public void removeDept(String id) {
@@ -170,12 +176,13 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 过滤子部门
+     * 过滤子部门
+     *
      * @param list 部门集合
-     * @param id 部门id
+     * @param id   部门id
-     * @return List<String>
+     * @return {@link List }<{@link String }>
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:58
+     * @since 2023/5/9 20:58
      */
     private List<String> filterSonDept(List<Dept> list, String id) {
         List<String> deptIds = new ArrayList<>();
@@ -189,11 +196,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     }
 
     /**
-     * @Description: 递归获取当前部门与下属子部门
+     * 递归获取当前部门与下属子部门
      * @param deptIds 部门id
      * @param filterList 过滤集合
-     * @Author DB
+     * @author DB
-     * @Date: 2023/5/9 20:59
+     * @since 2023/5/9 20:59
      */
     private void recursionRemoveIds(List<String> deptIds, List<Dept> filterList) {
         filterList.forEach(item -> {

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java

@@ -38,7 +38,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
      * 获取字典数据分页
      *
      * @param bo 请求参数
-     * @return Page<DictDataPageVo>
+     * @return {@link Page }<{@link DictDataPageVo }>
      * @author DB
      * @since 2023/12/01
      */
@@ -60,7 +60,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
      * 根据主键获取字典数据详情
      *
      * @param id 主键
-     * @return DictDataVo
+     * @return {@link DictDataVo }
      * @author DB
      * @since 2023/12/01
      */
@@ -73,7 +73,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
      * 根据字典类型获取字典数据
      *
      * @param dictType 字典类型
-     * @return List<DictDataVo>
+     * @return {@link List }<{@link DictData }>
      * @author DB
      * @since 2023/12/01
      */

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java

@@ -40,7 +40,7 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
      * 获取系统字典类型分页
      *
      * @param dictName 字典名
-     * @return R<Page < DictTypePageVo>>
+     * @return {@link Page }<{@link DictTypePageVo }>
      * @author DB
      * @since 2023/12/01
      */
@@ -60,7 +60,7 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
      * 查询系统类型是否存在
      *
      * @param bo 请求参数
-     * @return boolean
+     * @return {@link Boolean }
      * @author DB
      * @since 2023/12/01
      */
@@ -95,6 +95,9 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
 
     /**
      * 重置字典缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void resetDictCache() {
@@ -104,6 +107,9 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
 
     /**
      * 清空字典缓存数据
+     *
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void clearDictCache() {

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/FinanceReimburseServiceImpl.java

@@ -54,11 +54,12 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
 
     /**
      * 财务报销模块-报销分页列表
+     *
      * @param bo 请求参数
-     * @return R<Page<FinanceReimbursePageVo>>
+     * @return {@link Page }<{@link FinanceReimbursePageVo }>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Override
     public Page<FinanceReimbursePageVo> getFinanceReimbursePage(FinanceReimbursePageBo bo) {
         //获取当前登陆用户信息
@@ -91,11 +92,12 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
 
     /**
      * 财务报销模块-报销审核分页列表
+     *
      * @param bo 请求参数
-     * @return R<Page<FinanceReimbursePageVo>>
+     * @return {@link Page }<{@link FinanceReimburseAuditPageVo }>
      * @author DB
      * @since 2023/5/30 15:44
-     **/
+     */
     @Override
     public Page<FinanceReimburseAuditPageVo> getReimburseAuditPage(FinanceReimburseAuditPageBo bo) {
         PageDomain pageDomain = SqlUtils.getInstance().getPageDomain();
@@ -118,10 +120,11 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
 
     /**
      * 修改报销状态
+     *
      * @param bo 请求参数
      * @author DB
      * @since : 2023/5/10 16:01
-     **/
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateReimburseStatus(ReimburseStatusBo bo) {
@@ -163,9 +166,10 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
 
     /**
      * 新增报销申请
-     * @author DB
+     *
-     * @since  2023/09/21 15:55
      * @param bo 请求参数
+     * @author DB
+     * @since 2023/09/21 15:55
      */
     @Override
     public void insertReimburseApplication(ReimburseApplicationBo bo) {
@@ -198,9 +202,10 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
 
     /**
      * 修改报销申请
+     *
+     * @param bo 请求
      * @author DB
      * @since 2023/12/21
-     * @param bo 请求
      */
     @Override
     public void updateReimburseApplication(ReimburseApplicationBo bo) {
@@ -211,11 +216,12 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
     }
 
     /**
-     * @Description: 财务报销模块-个人报销统计
+     * 获取人员统计信息
-     * @return: R<Page<FinanceReimbursePageVo>>
+     *
-     * @Author: DB
+     * @return {@link ReimbursePersonStatisticVo }
-     * @Date: 2023/5/30 15:44
+     * @author DB
-     **/
+     * @since 2024/05/28
+     */
     @Override
     public ReimbursePersonStatisticVo getPersonStatistic() {
         //读取员工信息
@@ -230,11 +236,11 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
     }
 
     /**
-     * @descriptions 报销下款
+     * 报销支付
-     * @author DB
+     *
-     * @date 2023/09/08 15:20
      * @param bo 请求参数
-     * @return: com.jambox.core.base.R<java.lang.Void>
+     * @author DB
+     * @since 2024/05/28
      */
     @Override
     public void reimbursePay(ReimbursePayBo bo) {

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java

@@ -15,26 +15,18 @@ import com.cpop.core.utils.SpringUtils;
 import com.cpop.oam.business.bo.LoginForm;
 import com.cpop.oam.business.entity.Staff;
 import com.cpop.oam.business.service.LoginService;
-import com.cpop.oam.business.service.StaffService;
-import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
-import com.cpop.oam.business.entity.Menu;
 import com.cpop.oam.business.service.MenuService;
+import com.cpop.oam.business.service.StaffService;
 import com.cpop.oam.business.vo.LoginUserInfoVo;
 import com.cpop.oam.business.vo.MenuRouteVo;
-import org.apache.commons.lang3.StringUtils;
+import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import static com.cpop.core.base.table.table.UserTableDef.USER;
 import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
-import static com.cpop.oam.business.entity.table.MenuTableDef.MENU;
-import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU;
-import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
 
 /**
  * @author DB
@@ -124,39 +116,21 @@ public class LoginServiceImpl implements LoginService {
 
     /**
      * 获取权限码
+     *
+     * @return {@link List }<{@link String }>
      * @author DB
      * @since 2023-11-30 14:32:57
-     * @version 1.0.0
      */
     @Override
-    public Set<String> getPermCode() {
+    public List<String> getPermCode() {
-        SaSession session = StpUtil.getSession();
+        return StpUtil.getPermissionList();
-        if (StringUtils.equals(Constants.SUPER_ADMIN, session.getString("username"))) {
-            Set<String> permCodes = new HashSet<>();
-            permCodes.add("*.*.*");
-            return permCodes;
-        } else {
-            List<Menu> menuPermissions = SpringUtils.getBean(MenuService.class)
-                .queryChain()
-                .select(MENU.PERMISSION)
-                .leftJoin(ROLE_MENU)
-                .on(ROLE_MENU.MENU_ID.eq(MENU.ID))
-                .leftJoin(ROLE)
-                .on(ROLE.ID.eq(ROLE_MENU.ROLE_ID))
-                .where(ROLE.ID.eq(session.getString("roleId")))
-                .and(MENU.TYPE.in(1, 2))
-                .and(MENU.PERMISSION.isNotNull())
-                .list();
-            return menuPermissions.stream().map(Menu::getPermission).collect(Collectors.toSet());
-        }
-
     }
 
     /**
      * 获取菜单列表
      */
     @Override
-    public List<MenuRouteVo> getSysMenuList() {
+    public List<MenuRouteVo> getMenuList() {
-        return SpringUtils.getBean(MenuService.class).getSysMenuList();
+        return SpringUtils.getBean(MenuService.class).getMenuList();
     }
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java

@@ -38,11 +38,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 获取菜单路由
+     *
+     * @return {@link List }<{@link MenuRouteVo }>
      * @author DB
      * @since 2023/10/19 16:32
      */
     @Override
-    public List<MenuRouteVo> getSysMenuList() {
+    public List<MenuRouteVo> getMenuList() {
         SaSession session = StpUtil.getSession();
         //超级管理员
         if (Constants.SUPER_ADMIN.equals(session.getString("username"))) {
@@ -84,12 +86,14 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 获取系统菜单树列表
+     *
+     * @param bo 请求参数
+     * @return {@link List }<{@link MenuVo }>
      * @author DB
      * @since 2023/09/07 15:53
-     * @param bo 请求参数
      */
     @Override
-    public List<MenuVo> getSysMenuTreeList(MenuListBo bo) {
+    public List<MenuVo> getMenuTreeList(MenuListBo bo) {
         return buildMenuTree(this.listAs(QueryWrapper.create()
                 //状态不为空
                 .and(MENU.STATUS.eq(bo.getStatus()))
@@ -102,6 +106,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 获取目录与菜单树
+     *
+     * @return {@link List }<{@link MenuVo }>
      * @author DB
      * @since 2023/09/07 17:42
      */
@@ -115,11 +121,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
     }
 
     /**
-     * @descriptions 构建菜单树
+     * 构建菜单树
-     * @author DB
+     *
-     * @date 2023/09/07 16:36
      * @param menus 菜单集合
-     * @return java.util.List<com.jambox.OAMtem.business.vo.OAMMenuVo>
+     * @return {@link List }<{@link MenuVo }>
+     * @author DB
+     * @since 2024/05/28
      */
     private List<MenuVo> buildMenuTree(List<MenuVo> menus) {
         List<MenuVo> returnList = new ArrayList<MenuVo>();
@@ -138,11 +145,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 递归列表
-     * @author DB
+     *
-     * @since 2023/09/07 16:36
      * @param list 递归集合
      * @param menu 菜单
-     * @return com.jambox.OAMtem.business.vo.OAMMenuVo
+     * @return {@link MenuVo }
+     * @author DB
+     * @since 2023/09/07 16:36
      */
     private MenuVo recursionFn(List<MenuVo> list, MenuVo menu) {
         // 得到子节点列表
@@ -160,12 +168,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 新增菜单
+     *
+     * @param bo 请求参数
      * @author DB
      * @since 2023/09/07 17:50
-     * @param bo 请求参数
      */
     @Override
-    public void insertSysMenu(MenuBo bo) {
+    public void insertMenu(MenuBo bo) {
         Menu entity = BeanUtil.toBean(bo,Menu.class);
         SaSession session = StpUtil.getSession();
         //设置菜单名
@@ -197,7 +206,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      * @since 2023/5/10 16:01
      **/
     @Override
-    public void updateSysMenu(MenuBo bo) {
+    public void updateMenu(MenuBo bo) {
         Menu entity = BeanUtil.toBean(bo,Menu.class);
         //设置菜单名
         if (StrUtil.isNotBlank(bo.getPath())){
@@ -229,7 +238,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void removeSysMenu(String id) {
+    public void removeMenu(String id) {
         //查询所有
         List<Menu> list = this.queryChain().where(MENU.USER_TYPE.eq(StpUtil.getSession().get("userType"))).list();
         //递归获取当前菜单及其下属子菜单
@@ -260,10 +269,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 构建菜单路由树
+     *
      * @param menus 菜单集合
+     * @return {@link List }<{@link MenuRouteVo }>
      * @author DB
      * @since 2023/5/11 9:21
-     **/
+     */
     private List<MenuRouteVo> buildMenuRouteTree(List<MenuRouteVo> menus) {
         if (menus.isEmpty()){
             return menus;
@@ -292,11 +303,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 递归列表
+     *
      * @param list 菜单集合
      * @param menu 菜单
+     * @return {@link MenuRouteVo }
      * @author DB
      * @since 2023/5/11 9:22
-     **/
+     */
     private MenuRouteVo recursionMenuRoute(List<MenuRouteVo> list, MenuRouteVo menu) {
         // 得到子节点列表
         List<MenuRouteVo> childList = new ArrayList<MenuRouteVo>();

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java

@@ -41,13 +41,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
 
     /**
      * 查询角色分页列表
+     *
+     * @param bo 请求参数
+     * @return {@link Page }<{@link RolePageVo }>
      * @author DB
      * @since 2023/09/10 16:51
-     * @param bo 请求参数
-     * @return R<PageVo<SysRolePageVo>>
      */
     @Override
-    public Page<RolePageVo> getSysRolePage(RolePageBo bo) {
+    public Page<RolePageVo> getRolePage(RolePageBo bo) {
         PageDomain pageDomain = SqlUtils.getInstance().getPageDomain();
         Page<RolePageVo> page = this.mapper.paginateAs(pageDomain.getPage(), pageDomain.getPageSize(),
                 QueryWrapper.create()
@@ -80,7 +81,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertSysRole(RoleBo bo) {
+    public void insertRole(RoleBo bo) {
         Role role = BeanUtil.toBean(bo, Role.class);
         role.setUserType((UserType) StpUtil.getSession().get("userType"));
         this.save(role);
@@ -105,14 +106,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateSysRole(RoleBo bo) {
+    public void updateRole(RoleBo bo) {
         Role entity = BeanUtil.toBean(bo,Role.class);
         this.updateById(entity);
         //将菜单信息录入中间表
         if (!bo.getMenuIds().isEmpty()) {
             //先删后存
-            RoleMenuService sysRoleMenuService = SpringUtils.getBean(RoleMenuService.class);
+            RoleMenuService roleMenuService = SpringUtils.getBean(RoleMenuService.class);
-            sysRoleMenuService.remove(QueryWrapper.create()
+            roleMenuService.remove(QueryWrapper.create()
                     .where(ROLE_MENU.ROLE_ID.eq(entity.getId())));
             List<RoleMenu> roleMenus = new ArrayList<>();
             bo.getMenuIds().forEach(item -> {
@@ -121,7 +122,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
                 roleMenu.setRoleId(entity.getId());
                 roleMenus.add(roleMenu);
             });
-            sysRoleMenuService.saveBatch(roleMenus);
+            roleMenuService.saveBatch(roleMenus);
         }
     }
 
@@ -133,7 +134,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void removeSysRole(String id) {
+    public void removeRole(String id) {
         this.removeById(id);
         //删除相关联菜单
         SpringUtils.getBean(RoleMenuService.class).remove(QueryWrapper.create().where(ROLE_MENU.ROLE_ID.eq(id)));
@@ -146,7 +147,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      * @since 2023/5/9 14:13
      **/
     @Override
-    public void setSysRoleStatus(RoleStatusBo bo) {
+    public void setRoleStatus(RoleStatusBo bo) {
         this.updateById(BeanUtil.toBean(bo, Role.class));
     }
 

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java

@@ -66,10 +66,11 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 查询员工分页列表
+     *
+     * @param bo 请求参数
+     * @return {@link Page }<{@link StaffPageVo }>
      * @author DB
      * @since 2023/09/07 18:11
-     * @param bo 请求参数
-     * @return com.mybatisflex.core.paginate.Page<com.jambox.system.business.vo.SysStaffPageVo>
      */
     @Override
     public Page<StaffPageVo> getStaffPageList(StaffPageBo bo) {
@@ -100,9 +101,11 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 新增员工
+     *
+     * @param bo 请求参数
+     * @return {@link User }
      * @author DB
      * @since 2023/09/08 14:12
-     * @param bo 请求参数
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -139,11 +142,12 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 用户名-手机-邮箱都需要做唯一校验
+     *
      * @param bo 请求参数
-     * @return Boolean 通过/未通过
+     * @return {@link Boolean } 通过/未通过
      * @author DB
      * @since 2023/5/11 11:02
-     **/
+     */
     private Boolean validatedUserInfo(StaffBo bo) {
         long count = this.count(QueryWrapper.create()
                 //用户名
@@ -223,6 +227,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
      * @param id 主键
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void removeStaffById(String id) {
         //先获取员工
         Staff sysStaff = this.getById(id);
@@ -256,11 +261,12 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 获取员工信息
+     *
      * @param id 主键
-     * @return StaffInfoVo
+     * @return {@link StaffInfoVo }
      * @author DB
      * @since 2023/5/17 10:36
-     **/
+     */
     @Override
     public StaffInfoVo getStaffInfo(String id) {
         return this.getOneAs(QueryWrapper.create()
@@ -276,11 +282,12 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 获取用户操作日志分页
+     *
      * @param bo 请求参数
-     * @return R<PageVo<SysOperationLogVo>>
+     * @return {@link Page }<{@link OperationLogVo }>
      * @author DB
      * @since 2023/5/12 14:30
-     **/
+     */
     @Override
     public Page<OperationLogVo> getUserLogList(UserLogBo bo) {
         QueryWrapper queryWrapper = QueryWrapper.create();
@@ -333,10 +340,11 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 查询服务员工列表
-     * @return R<List<OamStaffVo>>
+     *
+     * @return {@link List }<{@link StaffVo }>
      * @author DB
      * @since 2023/5/11 17:49
-     **/
+     */
     @Override
     public List<StaffVo> getServiceStaffList() {
         return SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create()
@@ -351,9 +359,10 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
 
     /**
      * 技术模块-今日事务-查询技术员工列表
+     *
+     * @return {@link List }<{@link StaffVo }>
      * @author DB
      * @since 2023/12/04
-     * @return List<StaffVo>
      */
     @Override
     public List<StaffVo> getTechnologyStaffList() {
@@ -380,15 +389,15 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
     public void changeOperationStatus(OperationStatusBo bo) {
         //获取用户信息
         Staff staff = this.getById(bo.getId());
-        User User = DbChain.table(USER).select(USER.PHONE).where(USER.ID.eq(staff.getUserId())).oneAs(User.class);
+        User user = DbChain.table(USER).select(USER.PHONE).where(USER.ID.eq(staff.getUserId())).oneAs(User.class);
         JSONObject jsonBody = new JSONObject();
         if (bo.getIsOperation()) {
             jsonBody.put("_type", "oamAdd");
             jsonBody.put("name", staff.getName());
-            jsonBody.put("phone", User.getPhone());
+            jsonBody.put("phone", user.getPhone());
         } else {
             jsonBody.put("_type", "oamDel");
-            jsonBody.put("phone", User.getPhone());
+            jsonBody.put("phone", user.getPhone());
         }
 //        JSONObject jsonObject = SpringUtils.getBean(RestTemplate.class).postForObject(JamboxCloudUrl.COMMON_CARD_URL, jsonBody, JSONObject.class);
 //        assert jsonObject != null;

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java

@@ -73,7 +73,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
     /**
      * 工单模块-工单提交-接收/处理/暂停中
      *
-     * @return com.cpop.core.base.entity.R<com.mybatisflex.core.paginate.Page < com.cpop.oam.business.vo.TaskWorkOrderPageVo>>
+     * @return {@link TaskWorkOrderReceiveDealPauseVo }
      * @author DB
      * @since 2023/09/18 17:18
      */
@@ -182,6 +182,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
     /**
      * 工单模块-工单提交-获取当天值班人员
      *
+     * @return {@link WorkOrderDutyVo }
      * @author DB
      * @since 2023-11-29 14:01:03
      */
@@ -200,6 +201,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
     /**
      * 工单模块-工单提交-已办结分页列表
      *
+     * @return {@link Page }<{@link TaskWorkOrderPageVo }>
      * @author DB
      * @since 2023-11-29 14:35:08
      */
@@ -484,6 +486,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
      * 工单模块-工单提交-工单记录列表
      *
      * @param workOrderId 工单id
+     * @return {@link List }<{@link TaskWorkOrderRecordListVo }>
      * @author DB
      * @since 2023-11-29 11:25:28
      */
@@ -801,6 +804,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
     /**
      * 技术模块-技术-获取个人工单列表
      *
+     * @return {@link List }<{@link TaskWorkOrderPersonVo }>
      * @author DB
      * @since 2023-11-30 19:41:32
      */
@@ -885,12 +889,13 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
 
     /**
      * 工单统计-获取工单统计分页
+     *
+     * @param staffId   员工id
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return {@link Page }<{@link TaskWorkOrderStatPageVo }>
      * @author DB
      * @since 2024/1/31
-     * @param staffId 员工id
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return R<Page<TaskWorkOrderPageVo>>
      */
     @Override
     public Page<TaskWorkOrderStatPageVo> getWorkOrderStatPage(String staffId,LocalDate startDate,LocalDate endDate) {