CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整部门,员工,字典

Browse Source
This commit is contained in:
DB 2024-04-25 18:22:46 +08:00
parent 63a16aa6d1
commit 5a78ad69c8
48 changed files with 113 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Cpop-Core/src/main/java/com/cpop/core/base/enums/OperationLogEnum.java
View File

@ -17,66 +17,7 @@ public enum OperationLogEnum {
* 系统用户退出登录
*/
SYSTEM_LOGOUT(1, "i18n_operationLog_systemLogout", "SystemLoginModel", 6, 4),
/**
* 更新系统配置
*/
UPDATE_OAM_CONFIG(2, "i18n_operationLog_systemLogout", "SystemLoginModel", 5, 3),
//10-15 OAM菜单管理
/**
* 新增OAM菜单
*/
INSERT_OAM_MENU(10, "i18n_operationLog_insertOamMenu", "OamMenuModel", 5, 3),
/**
* 修改OAM菜单
*/
UPDATE_OAM_MENU(11, "i18n_operationLog_updateOamMenu", "OamMenuModel", 4, 3),
/**
* 删除OAM菜单
*/
REMOVE_OAM_MENU(12, "i18n_operationLog_removeOamMenu", "OamMenuModel", 4, 2),
//16-20 角色管理
/**
* 新增系统角色
*/
INSERT_OAM_ROLE(16, "i18n_operationLog_insertOamRole", "OamRoleModel", 5, 3),
/**
* 修改系统角色
*/
UPDATE_OAM_ROLE(17, "i18n_operationLog_updateOamRole", "OamRoleModel", 4, 3),
/**
* 删除系统角色
*/
REMOVE_OAM_ROLE(18, "i18n_operationLog_removeOamRole", "OamRoleModel", 4, 2),
//21-25 部门管理
/**
* 新增系统部门
*/
INSERT_OAM_DEPT(21, "i18n_operationLog_insertOamDept", "OamDeptModel", 5, 3),
/**
* 修改系统部门
*/
UPDATE_OAM_DEPT(22, "i18n_operationLog_updateOamDept", "OamDeptModel", 4, 3),
/**
* 删除系统部门
*/
REMOVE_OAM_DEPT(23, "i18n_operationLog_removeOamDept", "OamDeptModel", 4, 2),
//26-30 系统员工管理
/**
* 新增员工
*/
INSERT_OAM_STAFF(26, "i18n_operationLog_insertOamStaff", "OamStaffModel", 6, 4),
/**
* 修改系统用户
*/
UPDATE_OAM_STAFF(27, "i18n_operationLog_updateOamStaff", "OamStaffModel", 6, 4),
/**
* 删除系统用户
*/
REMOVE_OAM_STAFF(28, "i18n_operationLog_removeOamStaff", "OamStaffModel", 5, 3),
/**
* 修改系统用户密码
*/
MODIFY_OAM_STAFF_PASSWORD(29, "i18n_operationLog_updateOamStaffPassword", "OamStaffModel", 6, 4),
;
/**

2
Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataBo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataBo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.bo;
package com.cpop.oam.business.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataPageBo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataPageBo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.bo;
package com.cpop.oam.business.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
Cpop-System/src/main/java/com/cpop/system/business/bo/DictTypeBo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictTypeBo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.bo;
package com.cpop.oam.business.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

4
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageClueController.java
View File

@ -9,8 +9,8 @@ import com.cpop.oam.business.service.ClueRecordService;
import com.cpop.oam.business.service.ClueService;
import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.*;
import com.cpop.system.business.entity.DictData;
import com.cpop.system.business.service.DictDataService;
import com.cpop.oam.business.entity.DictData;
import com.cpop.oam.business.service.DictDataService;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;

16
Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictDataController.java → Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictDataController.java
View File

@ -1,12 +1,12 @@
package com.cpop.system.business.controller.backstage;
package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.system.business.bo.DictDataBo;
import com.cpop.system.business.bo.DictDataPageBo;
import com.cpop.system.business.vo.DictDataListVo;
import com.cpop.system.business.vo.DictDataPageVo;
import com.cpop.system.business.vo.DictDataVo;
import com.cpop.oam.business.bo.DictDataBo;
import com.cpop.oam.business.bo.DictDataPageBo;
import com.cpop.oam.business.vo.DictDataListVo;
import com.cpop.oam.business.vo.DictDataPageVo;
import com.cpop.oam.business.vo.DictDataVo;
import com.mybatisflex.core.paginate.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import com.cpop.system.business.entity.DictData;
import com.cpop.system.business.service.DictDataService;
import com.cpop.oam.business.entity.DictData;
import com.cpop.oam.business.service.DictDataService;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;

12
Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictTypeController.java → Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java
View File

@ -1,13 +1,13 @@
package com.cpop.system.business.controller.backstage;
package com.cpop.oam.business.controller.backstage;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.enums.UserType;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.system.business.bo.DictTypeBo;
import com.cpop.system.business.vo.DictTypePageVo;
import com.cpop.system.business.vo.DictTypeVo;
import com.cpop.oam.business.bo.DictTypeBo;
import com.cpop.oam.business.vo.DictTypePageVo;
import com.cpop.oam.business.vo.DictTypeVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import com.cpop.system.business.entity.DictType;
import com.cpop.system.business.service.DictTypeService;
import com.cpop.oam.business.entity.DictType;
import com.cpop.oam.business.service.DictTypeService;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;

4
Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageMenuController.java → Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageMenuController.java
View File

@ -1,9 +1,9 @@
package com.cpop.system.business.controller.backstage;
package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.system.business.bo.MenuBo;
import com.cpop.system.business.bo.MenuListBo;
import com.cpop.system.business.service.MenuService;
import com.cpop.oam.business.service.MenuService;
import com.cpop.system.business.vo.MenuVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

6
Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageRoleController.java → Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageRoleController.java
View File

@ -1,12 +1,12 @@
package com.cpop.system.business.controller.backstage;
package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.system.business.bo.MenuListBo;
import com.cpop.system.business.bo.RoleBo;
import com.cpop.system.business.bo.RolePageBo;
import com.cpop.system.business.bo.RoleStatusBo;
import com.cpop.system.business.service.MenuService;
import com.cpop.system.business.service.RoleService;
import com.cpop.oam.business.service.MenuService;
import com.cpop.oam.business.service.RoleService;
import com.cpop.system.business.vo.MenuVo;
import com.cpop.system.business.vo.RolePageVo;
import com.mybatisflex.core.paginate.Page;

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

@ -1,15 +1,13 @@
package com.cpop.oam.business.controller.backstage;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.anno.OperationLog;
import com.cpop.core.base.entity.R;
import com.cpop.core.base.enums.OperationLogEnum;
import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.bo.*;
import com.cpop.oam.business.service.DeptService;
import com.cpop.oam.business.service.RoleService;
import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.*;
import com.cpop.system.business.service.RoleService;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
@ -21,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.cpop.system.business.entity.table.RoleTableDef.ROLE;
import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
/**
@ -62,7 +60,6 @@ public class BackstageStaffController {
* @param bo 请求参数
* @return com.jambox.core.base.R<java.lang.Void>
*/
@OperationLog(operationLogEnumType= OperationLogEnum.INSERT_OAM_STAFF)
@Operation(summary = "新增员工")
@PostMapping("/insertStaff")
public R<Void> insertStaff(@RequestBody @Validated StaffBo bo) {
@ -77,7 +74,6 @@ public class BackstageStaffController {
* @param bo 请求参数
* @return com.jambox.core.base.R<java.lang.Void>
*/
@OperationLog(operationLogEnumType= OperationLogEnum.UPDATE_OAM_STAFF)
@Operation(summary = "修改员工")
@PutMapping("/updateStaff")
public R<Void> updateStaff(@RequestBody @Validated StaffBo bo) {
@ -92,7 +88,6 @@ public class BackstageStaffController {
* @param id 主键
* @return com.jambox.core.base.R<java.lang.Void>
*/
@OperationLog(operationLogEnumType= OperationLogEnum.REMOVE_OAM_STAFF)
@Operation(summary = "删除员工")
@DeleteMapping("/removeStaffById/{id}")
public R<Void> removeStaffById(@PathVariable String id) {
@ -178,7 +173,6 @@ public class BackstageStaffController {
* @author DB
* @since 2023/5/12 16:00
**/
@OperationLog(operationLogEnumType= OperationLogEnum.MODIFY_OAM_STAFF_PASSWORD)
@Operation(summary = "修改系统用户密码")
@PutMapping("/modifyUserPassword")
public R<Void> modifyUserPassword(@Validated @RequestBody ModifyUserPasswordBo bo) {

5
Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java → Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java
View File

@ -1,11 +1,8 @@
package com.cpop.system.business.controller.backstage;
package com.cpop.oam.business.controller.backstage;
import com.cpop.core.base.entity.R;
import com.cpop.core.config.CpopConfig;
import com.cpop.core.config.ServerConfig;
import com.cpop.core.utils.file.FileUploadUtils;
import com.cpop.core.utils.file.FileUtils;
import com.cpop.system.business.service.StoreService;
import com.cpop.system.business.vo.SysFileVo;
import com.cpop.system.framework.handler.TencentCosHandler;
import com.qcloud.cos.model.UploadResult;

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

@ -44,7 +44,6 @@ public class BackstageSysConfigController {
* @author DB
* @since 2023/5/11 15:48
**/
@OperationLog(operationLogEnumType = OperationLogEnum.UPDATE_OAM_CONFIG)
@Operation(summary = "设置系统配置信息")
@PutMapping("/setSysConfigInfo")
public R<Void> setSysConfigInfo(@RequestBody @Validated SysConfigInfoBo bo) {

2
Cpop-System/src/main/java/com/cpop/system/business/entity/DictData.java → Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictData.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.entity;
package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener;

2
Cpop-System/src/main/java/com/cpop/system/business/entity/DictType.java → Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictType.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.entity;
package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener;

2
Cpop-System/src/main/java/com/cpop/system/business/entity/Menu.java → Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Menu.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.entity;
package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener;

2
Cpop-System/src/main/java/com/cpop/system/business/entity/Role.java → Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Role.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.entity;
package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener;

2
Cpop-System/src/main/java/com/cpop/system/business/entity/RoleMenu.java → Cpop-Oam/src/main/java/com/cpop/oam/business/entity/RoleMenu.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.entity;
package com.cpop.oam.business.entity;
import com.cpop.core.base.entity.BaseEntity;
import com.cpop.core.base.entity.BaseInsertListener;

4
Cpop-System/src/main/java/com/cpop/system/business/mapper/DictDataMapper.java → Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictDataMapper.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.mapper;
package com.cpop.oam.business.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cpop.system.business.entity.DictData;
import com.cpop.oam.business.entity.DictData;
/**
* 系统-字典数据表 映射层。

4
Cpop-System/src/main/java/com/cpop/system/business/mapper/DictTypeMapper.java → Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictTypeMapper.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.mapper;
package com.cpop.oam.business.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cpop.system.business.entity.DictType;
import com.cpop.oam.business.entity.DictType;
/**
* 系统-字典表 映射层。

4
Cpop-System/src/main/java/com/cpop/system/business/mapper/MenuMapper.java → Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/MenuMapper.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.mapper;
package com.cpop.oam.business.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cpop.system.business.entity.Menu;
import com.cpop.oam.business.entity.Menu;
/**
* 系统菜单表 映射层。

4
Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMapper.java → Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMapper.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.mapper;
package com.cpop.oam.business.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cpop.system.business.entity.Role;
import com.cpop.oam.business.entity.Role;
/**
* 系统角色表 映射层。

4
Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMenuMapper.java → Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMenuMapper.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.mapper;
package com.cpop.oam.business.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cpop.system.business.entity.RoleMenu;
import com.cpop.oam.business.entity.RoleMenu;
/**
* 系统-角色-菜单表 映射层。

13
Cpop-System/src/main/java/com/cpop/system/business/service/DictDataService.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictDataService.java
View File

@ -1,13 +1,12 @@
package com.cpop.system.business.service;
package com.cpop.oam.business.service;
import com.cpop.system.business.bo.DictDataBo;
import com.cpop.system.business.bo.DictDataPageBo;
import com.cpop.system.business.vo.DictDataListVo;
import com.cpop.system.business.vo.DictDataPageVo;
import com.cpop.system.business.vo.DictDataVo;
import com.cpop.oam.business.bo.DictDataBo;
import com.cpop.oam.business.bo.DictDataPageBo;
import com.cpop.oam.business.vo.DictDataPageVo;
import com.cpop.oam.business.vo.DictDataVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.cpop.system.business.entity.DictData;
import com.cpop.oam.business.entity.DictData;
import java.util.List;

8
Cpop-System/src/main/java/com/cpop/system/business/service/DictTypeService.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictTypeService.java
View File

@ -1,10 +1,10 @@
package com.cpop.system.business.service;
package com.cpop.oam.business.service;
import com.cpop.system.business.bo.DictTypeBo;
import com.cpop.system.business.vo.DictTypePageVo;
import com.cpop.oam.business.bo.DictTypeBo;
import com.cpop.oam.business.vo.DictTypePageVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.cpop.system.business.entity.DictType;
import com.cpop.oam.business.entity.DictType;
/**
* 系统-字典表 服务层。

4
Cpop-System/src/main/java/com/cpop/system/business/service/MenuService.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java
View File

@ -1,11 +1,11 @@
package com.cpop.system.business.service;
package com.cpop.oam.business.service;
import com.cpop.system.business.bo.MenuBo;
import com.cpop.system.business.bo.MenuListBo;
import com.cpop.system.business.vo.MenuRouteVo;
import com.cpop.system.business.vo.MenuVo;
import com.mybatisflex.core.service.IService;
import com.cpop.system.business.entity.Menu;
import com.cpop.oam.business.entity.Menu;
import java.util.List;

4
Cpop-System/src/main/java/com/cpop/system/business/service/RoleMenuService.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleMenuService.java
View File

@ -1,7 +1,7 @@
package com.cpop.system.business.service;
package com.cpop.oam.business.service;
import com.mybatisflex.core.service.IService;
import com.cpop.system.business.entity.RoleMenu;
import com.cpop.oam.business.entity.RoleMenu;
/**
* 系统-角色-菜单表 服务层。

4
Cpop-System/src/main/java/com/cpop/system/business/service/RoleService.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleService.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.service;
package com.cpop.oam.business.service;
import com.cpop.system.business.bo.RoleBo;
import com.cpop.system.business.bo.RolePageBo;
@ -6,7 +6,7 @@ import com.cpop.system.business.bo.RoleStatusBo;
import com.cpop.system.business.vo.RolePageVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.cpop.system.business.entity.Role;
import com.cpop.oam.business.entity.Role;
/**
* 系统角色表 服务层。

4
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/ClueServiceImpl.java
View File

@ -19,9 +19,9 @@ import com.cpop.oam.business.vo.CluePutOffVo;
import com.cpop.oam.business.vo.ClueUpdateVo;
import com.cpop.oam.business.vo.PersonSignGoalVo;
import com.cpop.oam.framework.constant.OamRedisConstant;
import com.cpop.system.business.entity.DictData;
import com.cpop.oam.business.entity.DictData;
import com.cpop.system.business.entity.Store;
import com.cpop.system.business.service.DictDataService;
import com.cpop.oam.business.service.DictDataService;
import com.cpop.system.business.service.StoreService;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryOrderBy;

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

@ -1,10 +1,9 @@
package com.cpop.oam.business.service.impl;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.MessageUtils;
import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.bo.DeptBo;
import com.cpop.oam.business.bo.DeptListBo;
import com.cpop.oam.business.entity.Dept;
@ -160,13 +159,13 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
List<String> deptIds = filterSonDept(list, id);
//删除部门，首先要查询员工
if (SpringUtils.getBean(StaffMidDeptService.class).count(QueryWrapper.create().where(STAFF_MID_DEPT.DEPT_ID.in(deptIds))) > 0) {
throw new ServiceException(MessageUtils.message("i18n_alert_peopleUnderTheDepartmentError"));
throw new ServiceException("当前部门下有人员，不允许删除部门!");
} else {
//当部门人员及其子部门人员为空时，才允许删除部门
this.removeByIds(deptIds);
}
}else {
throw new ServiceException(MessageUtils.message("i18n_alert_departmentNotDeactivatedError"));
throw new ServiceException("当前部门未停用，不允许删除部门!");
}
}

16
Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictDataServiceImpl.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.service.impl;
package com.cpop.oam.business.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.base.entity.PageDomain;
@ -6,17 +6,17 @@ import com.cpop.core.base.enums.UserType;
import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.system.business.bo.DictDataBo;
import com.cpop.system.business.bo.DictDataPageBo;
import com.cpop.system.business.vo.DictDataPageVo;
import com.cpop.system.business.vo.DictDataVo;
import com.cpop.oam.business.bo.DictDataBo;
import com.cpop.oam.business.bo.DictDataPageBo;
import com.cpop.oam.business.vo.DictDataPageVo;
import com.cpop.oam.business.vo.DictDataVo;
import com.cpop.system.framework.utils.DictUtils;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.system.business.entity.DictData;
import com.cpop.system.business.mapper.DictDataMapper;
import com.cpop.system.business.service.DictDataService;
import com.cpop.oam.business.entity.DictData;
import com.cpop.oam.business.mapper.DictDataMapper;
import com.cpop.oam.business.service.DictDataService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

16
Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictTypeServiceImpl.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.service.impl;
package com.cpop.oam.business.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.utils.StringUtils;
@ -6,17 +6,17 @@ import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils;
import com.cpop.system.business.bo.DictTypeBo;
import com.cpop.system.business.entity.DictData;
import com.cpop.system.business.service.DictDataService;
import com.cpop.system.business.vo.DictTypePageVo;
import com.cpop.oam.business.bo.DictTypeBo;
import com.cpop.oam.business.entity.DictData;
import com.cpop.oam.business.service.DictDataService;
import com.cpop.oam.business.vo.DictTypePageVo;
import com.cpop.system.framework.utils.DictUtils;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.system.business.entity.DictType;
import com.cpop.system.business.mapper.DictTypeMapper;
import com.cpop.system.business.service.DictTypeService;
import com.cpop.oam.business.entity.DictType;
import com.cpop.oam.business.mapper.DictTypeMapper;
import com.cpop.oam.business.service.DictTypeService;
import org.springframework.stereotype.Service;
import java.util.Comparator;

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

@ -16,8 +16,8 @@ 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.system.business.entity.Menu;
import com.cpop.system.business.service.MenuService;
import com.cpop.oam.business.entity.Menu;
import com.cpop.oam.business.service.MenuService;
import com.cpop.system.business.vo.LoginUserInfoVo;
import com.cpop.system.business.vo.MenuRouteVo;
import org.apache.commons.lang3.StringUtils;

8
Cpop-System/src/main/java/com/cpop/system/business/service/impl/MenuServiceImpl.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.service.impl;
package com.cpop.oam.business.service.impl;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil;
@ -9,9 +9,9 @@ import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.system.business.bo.MenuBo;
import com.cpop.system.business.bo.MenuListBo;
import com.cpop.system.business.entity.Menu;
import com.cpop.system.business.mapper.MenuMapper;
import com.cpop.system.business.service.MenuService;
import com.cpop.oam.business.entity.Menu;
import com.cpop.oam.business.mapper.MenuMapper;
import com.cpop.oam.business.service.MenuService;
import com.cpop.system.business.vo.MenuRouteVo;
import com.cpop.system.business.vo.MenuVo;
import com.cpop.system.framework.enums.InitRoleEnum;

8
Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleMenuServiceImpl.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleMenuServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.cpop.system.business.service.impl;
package com.cpop.oam.business.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.system.business.entity.RoleMenu;
import com.cpop.system.business.mapper.RoleMenuMapper;
import com.cpop.system.business.service.RoleMenuService;
import com.cpop.oam.business.entity.RoleMenu;
import com.cpop.oam.business.mapper.RoleMenuMapper;
import com.cpop.oam.business.service.RoleMenuService;
import org.springframework.stereotype.Service;
/**

12
Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleServiceImpl.java → Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.service.impl;
package com.cpop.oam.business.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.cpop.core.base.entity.PageDomain;
@ -11,15 +11,15 @@ import com.cpop.core.utils.SqlUtils;
import com.cpop.system.business.bo.RoleBo;
import com.cpop.system.business.bo.RolePageBo;
import com.cpop.system.business.bo.RoleStatusBo;
import com.cpop.system.business.entity.RoleMenu;
import com.cpop.system.business.service.RoleMenuService;
import com.cpop.oam.business.entity.RoleMenu;
import com.cpop.oam.business.service.RoleMenuService;
import com.cpop.system.business.vo.RolePageVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cpop.system.business.entity.Role;
import com.cpop.system.business.mapper.RoleMapper;
import com.cpop.system.business.service.RoleService;
import com.cpop.oam.business.entity.Role;
import com.cpop.oam.business.mapper.RoleMapper;
import com.cpop.oam.business.service.RoleService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

@ -43,9 +43,9 @@ import java.util.List;
import static com.cpop.core.base.table.table.OperationLogTableDef.OPERATION_LOG;
import static com.cpop.core.base.table.table.UserTableDef.USER;
import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
import static com.cpop.oam.business.entity.table.StaffMidDeptTableDef.STAFF_MID_DEPT;
import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
import static com.cpop.system.business.entity.table.RoleTableDef.ROLE;
import static com.mybatisflex.core.query.QueryMethods.distinct;
import static com.mybatisflex.core.query.QueryMethods.groupConcat;
@ -177,7 +177,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
public void updateStaff(StaffBo bo) {
//先修改系统用户信息 用户名-手机-邮箱都需要做唯一校验
if (validatedUserInfo(bo)) {
throw new ServiceException(MessageUtils.message("i18n_alert_userOrPhoneOrEmailIsExist"));
throw new ServiceException("用户名或手机号或邮箱已存在!");
} else {
User user = BeanUtils.mapToClass(bo, User.class);
user.setId(bo.getUserId());
@ -242,10 +242,10 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
if (StringUtils.isBlank(username)){
return;
}
if (this.count(QueryWrapper.create()
if (SpringUtils.getBean(UserService.class).count(QueryWrapper.create()
.where(USER.USERNAME.eq(username))
.and(USER.ID.ne(id))) > 0) {
throw new ServiceException(MessageUtils.message("i18n_alert_userIsExist"));
throw new ServiceException("用户已存在!");
}
}

2
Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataListVo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataListVo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.vo;
package com.cpop.oam.business.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataPageVo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataPageVo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.vo;
package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;

2
Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataVo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataVo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.vo;
package com.cpop.oam.business.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypePageVo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypePageVo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.vo;
package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;

2
Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypeVo.java → Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypeVo.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.vo;
package com.cpop.oam.business.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java
View File

@ -1,8 +1,8 @@
package com.cpop.oam.framework.config;
import com.cpop.core.utils.SpringUtils;
import com.cpop.system.business.entity.Role;
import com.cpop.system.business.service.RoleService;
import com.cpop.oam.business.entity.Role;
import com.cpop.oam.business.service.RoleService;
import com.cpop.system.framework.enums.InitRoleEnum;
import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;

2
Cpop-System/src/main/resources/mapper/DictDataMapper.xml → Cpop-Oam/src/main/resources/DictDataMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cpop.system.business.mapper.DictDataMapper">
<mapper namespace="com.cpop.oam.business.mapper.DictDataMapper">
</mapper>

2
Cpop-System/src/main/resources/mapper/DictTypeMapper.xml → Cpop-Oam/src/main/resources/DictTypeMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cpop.system.business.mapper.DictTypeMapper">
<mapper namespace="com.cpop.oam.business.mapper.DictTypeMapper">
</mapper>

2
Cpop-System/src/main/resources/mapper/MenuMapper.xml → Cpop-Oam/src/main/resources/mapper/MenuMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cpop.system.business.mapper.MenuMapper">
<mapper namespace="com.cpop.oam.business.mapper.MenuMapper">
</mapper>

2
Cpop-System/src/main/resources/mapper/RoleMapper.xml → Cpop-Oam/src/main/resources/mapper/RoleMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cpop.system.business.mapper.RoleMapper">
<mapper namespace="com.cpop.oam.business.mapper.RoleMapper">
</mapper>

2
Cpop-System/src/main/resources/mapper/RoleMenuMapper.xml → Cpop-Oam/src/main/resources/mapper/RoleMenuMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cpop.system.business.mapper.RoleMenuMapper">
<mapper namespace="com.cpop.oam.business.mapper.RoleMenuMapper">
</mapper>

1
Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java
View File

@ -2,7 +2,6 @@ package com.cpop.system.framework.utils;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.cpop.core.base.enums.UserType;
import com.cpop.core.constant.Constants;
import com.cpop.core.service.RedisService;