From 6c9f0bf3e9a7c06aea76c34e06e8070085cd5e5a Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Wed, 19 Jun 2024 07:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlayClerkUserInfoController.java          | 22 ++++++++++++++++++-
 .../service/IPlayClerkUserInfoService.java    |  1 +
 .../system/service/SysRoleService.java        |  7 ++++++
 .../system/service/SysUserRoleService.java    |  1 +
 .../service/impl/SysRoleServiceImpl.java      |  8 +++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
index 298e10f..8abbc5b 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
@@ -11,6 +11,12 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserStateEditVo;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
 import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
+import com.starry.admin.modules.system.entity.SysRoleEntity;
+import com.starry.admin.modules.system.entity.SysUserEntity;
+import com.starry.admin.modules.system.entity.SysUserRoleEntity;
+import com.starry.admin.modules.system.service.SysRoleService;
+import com.starry.admin.modules.system.service.SysUserRoleService;
+import com.starry.admin.modules.system.service.SysUserService;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
 import com.starry.common.annotation.Log;
@@ -38,6 +44,12 @@ public class PlayClerkUserInfoController {
     @Resource
     private IPlayClerkUserInfoService playClerkUserInfoService;
 
+    @Resource
+    private SysRoleService sysRoleService;
+
+    @Resource
+    private SysUserRoleService userRoleService;
+
     /**
      * 查询店员列表
      */
@@ -90,7 +102,8 @@ public class PlayClerkUserInfoController {
 
 
     /**
-     * 修改店员分组
+     * 1、修改店员分组
+     * 2、将对应账号角色ID设为组长
      */
     @PostMapping("editClerkGroup")
     public R editClerkGroup(@Validated @RequestBody PlayClerkUserTypeEditVo vo) {
@@ -107,8 +120,15 @@ public class PlayClerkUserInfoController {
             entity.setId(clerkUserId);
             entity.setGroupId(vo.getTypeId());
             playClerkUserInfoService.update(entity);
+
+            SysRoleEntity role = sysRoleService.selectByRoleKey("leader");
+            SysUserRoleEntity userEntity = new SysUserRoleEntity();
+            userEntity.setUserId(clerkUserId);
+            userEntity.setRoleId(role.getRoleId());
+//            userRoleService.saveBatch(userEntity);
         }
 
+
         return R.ok("成功");
     }
 
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
index e871594..9e23ecc 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
@@ -36,6 +36,7 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
 
     /**
      * 根据分组ID查询店员列表
+     * @param groupId 分组ID
      *
      * @return 店员列表
      */
diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java
index d33a048..44bcf8b 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java
@@ -19,6 +19,13 @@ import java.util.Set;
  */
 public interface SysRoleService extends IService<SysRoleEntity> {
 
+
+    /**
+     * 根据roleKey 查询角色
+     * @param roleKey 角色标识
+     * @return 角色
+     */
+    SysRoleEntity selectByRoleKey(String roleKey);
     /**
      * 校验角色名称是否唯一
      *
diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java
index 2bcc455..b546d31 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java
@@ -14,4 +14,5 @@ import com.starry.admin.modules.system.entity.SysUserRoleEntity;
  */
 public interface SysUserRoleService extends IService<SysUserRoleEntity> {
 
+
 }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java
index aa20069..0e1d19c 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java
@@ -48,6 +48,14 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
     @Resource
     private SysUserService userService;
 
+
+    @Override
+    public SysRoleEntity selectByRoleKey(String roleKey) {
+        LambdaQueryWrapper<SysRoleEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysRoleEntity::getRoleKey, roleKey);
+        return this.baseMapper.selectOne(lambdaQueryWrapper);
+    }
+
     /**
      * 校验角色名称是否唯一
      *