From c1f31aff0a5737b12b2cb6d046056cc61252e96e Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 3 Jul 2025 19:51:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:admin=E6=B3=A8=E5=86=8C=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/admin/service/impl/SysUserServiceImpl.java | 4 ++++ .../admin/service/impl/SysUserTransactionServiceImpl.java | 8 +++++--- .../impl/rule/WalletRuleTransactionServiceImpl.java | 4 ++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index d9ff9f753..46c8ef2e1 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -721,6 +721,10 @@ public class SysUserServiceImpl extends ServiceImpl impl String message = MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, userDto.getPhone()); return R.failed(message); } + + // 设置权限 + List defaultRoles = sysRoleService.findRolesByCodes(List.of(CommonRoleConstant.DEFAULT_USER, CommonRoleConstant.AUTO_CREATE_WALLET)); + userDto.setRole(defaultRoles.stream().map(SysRole::getRoleId).toList()); saveUser(userDto); return R.ok(true); } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java index d05106f8a..3fb9c2beb 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java @@ -243,7 +243,7 @@ public class SysUserTransactionServiceImpl extends ServiceImpl leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE"), ParamResolver.getStr("USER_TRANSACTION_TRANSFER")); + // 离职退休人员部门id + // List leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE"), ParamResolver.getStr("USER_TRANSACTION_TRANSFER")); + // 离职用户 + List leaveDeptIds = List.of(ParamResolver.getStr("USER_TRANSACTION_LEAVE")); List updateList = new ArrayList<>(); for (SysUserTransactionEntity v : list) { try { diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java index 0d22c7d67..4f11eeea3 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java @@ -75,6 +75,10 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl Date: Thu, 3 Jul 2025 19:52:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/admin/controller/RegisterController.java | 12 ++++++------ .../admin/service/impl/SysUserServiceImpl.java | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/RegisterController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/RegisterController.java index 6e0a79ff4..6a5c5a410 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/RegisterController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/RegisterController.java @@ -32,12 +32,12 @@ public class RegisterController { * @param userDto 用户信息 * @return success/false */ - @SysLog("注册用户") - @PostMapping("/user") - @ConditionalOnProperty(name = "register.user", matchIfMissing = true) - public R registerUser(@RequestBody UserDTO userDto) { - return userService.registerUser(userDto); - } +// @SysLog("注册用户") +// @PostMapping("/user") +// @ConditionalOnProperty(name = "register.user", matchIfMissing = true) +// public R registerUser(@RequestBody UserDTO userDto) { +// return userService.registerUser(userDto); +// } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index 46c8ef2e1..163b643ce 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -722,9 +722,6 @@ public class SysUserServiceImpl extends ServiceImpl impl return R.failed(message); } - // 设置权限 - List defaultRoles = sysRoleService.findRolesByCodes(List.of(CommonRoleConstant.DEFAULT_USER, CommonRoleConstant.AUTO_CREATE_WALLET)); - userDto.setRole(defaultRoles.stream().map(SysRole::getRoleId).toList()); saveUser(userDto); return R.ok(true); }