From 0ae86a813fa675f21745a32642df36c26e18150d Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Wed, 10 Jul 2024 15:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.9=E3=80=91=E3=80=90log=E3=80=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=AC=E5=8F=B8=E6=88=96=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/sys/api/constants/SysBizLogConstants.java     | 5 +++++
 .../user/controller/UserRoleAssignPageController.java    | 3 +++
 .../user/service/impl/SysRoleAssignServiceImpl.java      | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysBizLogConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysBizLogConstants.java
index e5ae4899a..8d3eed0bb 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysBizLogConstants.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/constants/SysBizLogConstants.java
@@ -13,4 +13,9 @@ public interface SysBizLogConstants {
      */
     String LOG_UPDATE_USER_PASSWORD = "UPDATE_USER_PASSWORD";
 
+    /**
+     * 绑定公司角色和业务角色
+     */
+    String BIND_COMPANY_ROLE_BIZ_ROLE = "BIND_COMPANY_ROLE_BIZ_ROLE";
+
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/UserRoleAssignPageController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/UserRoleAssignPageController.java
index 800750d9c..d30780502 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/UserRoleAssignPageController.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/UserRoleAssignPageController.java
@@ -1,11 +1,13 @@
 package cn.stylefeng.roses.kernel.sys.modular.user.controller;
 
+import cn.stylefeng.roses.kernel.rule.annotation.BizLog;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
+import cn.stylefeng.roses.kernel.sys.api.constants.SysBizLogConstants;
 import cn.stylefeng.roses.kernel.sys.api.pojo.user.newrole.NewUserRoleBindResponse;
 import cn.stylefeng.roses.kernel.sys.api.pojo.user.newrole.request.DeleteRequest;
 import cn.stylefeng.roses.kernel.sys.api.pojo.user.newrole.request.RoleControlRequest;
@@ -69,6 +71,7 @@ public class UserRoleAssignPageController {
      * @since 2024-01-18 9:31
      */
     @PostResource(name = "绑定或取消绑定角色", path = "/sysRoleAssign/changeRoleSelect")
+    @BizLog(logTypeCode = SysBizLogConstants.BIND_COMPANY_ROLE_BIZ_ROLE)
     public ResponseData<?> changeRoleSelect(@RequestBody @Validated RoleControlRequest roleControlRequest) {
         sysRoleAssignService.changeRoleSelect(roleControlRequest);
         return new SuccessResponseData<>();
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysRoleAssignServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysRoleAssignServiceImpl.java
index 3d8d4e931..f26836ddc 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysRoleAssignServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysRoleAssignServiceImpl.java
@@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.user.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
+import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.api.SysRoleServiceApi;
@@ -126,6 +127,14 @@ public class SysRoleAssignServiceImpl implements SysRoleAssignService {
 
         // 清空用户绑定的缓存
         userRoleCache.remove(String.valueOf(roleControlRequest.getUserId()));
+
+        // 记录业务日志
+        BusinessLogUtil.setLogTitle("绑定公司或业务角色");
+        BusinessLogUtil.addContent("用户id：", roleControlRequest.getUserId(),
+                "，角色id：", roleControlRequest.getRoleId(),
+                "，角色类型：", roleControlRequest.getRoleType(),
+                "，机构id：", roleControlRequest.getOrgId(),
+                "，绑定状态：", roleControlRequest.getCheckedFlag());
     }
 
     @Override