调整平台主持人逻辑

platform-common/src/main/java/com/platform/enums/SysRoleEnum.java

@@ -1,26 +1,26 @@
 package com.platform.enums;
 
 public enum SysRoleEnum {
-    ADMIN(5, "超级管理员"),
-    COMPONY_ADMIN(6, "平台主持人"),
-    COMPONY_EMPLOYEE(8, "公司员工"),
-    PLATFORM_STREAMER(9, "平台主持人");
+    ADMIN(5L, "超级管理员"),
+    COMPONY_ADMIN(6L, "平台主持人"),
+    COMPONY_EMPLOYEE(8L, "公司员工"),
+    PLATFORM_STREAMER(9L, "平台主持人");
 
-    private int code;
+    private Long code;
     private String desc;
 
-    public static int PLATFORM_STREAMER_CODE = 9;
+    public static Long PLATFORM_STREAMER_CODE = 9L;
 
-    SysRoleEnum(int code, String desc) {
+    SysRoleEnum(Long code, String desc) {
         this.code = code;
         this.desc = desc;
     }
 
-    public int getCode() {
+    public Long getCode() {
         return code;
     }
 
-    public void setCode(int code) {
+    public void setCode(Long code) {
         this.code = code;
     }
 

platform-common/src/main/java/com/platform/service/impl/SysUserServiceImpl.java

@@ -106,10 +106,10 @@ public class SysUserServiceImpl implements SysUserService {
     public IPage<SysUserEntity> getSysUserList(List<Long> deptIdList , String key , long brandId , long pageNum, long pageSize) {
 
         QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sysUser.status" , 1);
         if(!CollectionUtils.isEmpty(deptIdList)){
-            queryWrapper.in("sysUser.dept_id" , deptIdList);
+            queryWrapper.and(wrapper->wrapper.in("sysUser.dept_id" , deptIdList).or().eq("sysUser.is_platform_streamer",true));
         }
-        queryWrapper.eq("sysUser.status" , 1);
         if(StringUtils.isNotBlank(key)){
             queryWrapper.like("sysUser.username" , key);
         }

platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -82,6 +82,11 @@ public class SysUserController extends AbstractController {
         if (null == resultPage) {
             return R.error("获取用户列表失败");
         }
+        resultPage.getRecords().parallelStream().forEach(user->{
+            if (!ObjectUtils.isEmpty(user.getIsPlatformStreamer()) && user.getIsPlatformStreamer()) {
+                user.setRoleName("平台主持人");
+            }
+        });
         return R.ok(CommonDataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages()
                 , resultPage.getCurrent(), resultPage.getRecords()));
     }
@@ -350,29 +355,24 @@ public class SysUserController extends AbstractController {
         }
 
         Long deptId = sysUserEntity.getDeptId();
-
-        // 更新企业员工信息
-        long num = sysUserService.getUserNumOfDept(deptId);
-
-        if (ObjectUtils.isEmpty(deptId)) {
-            return R.error("删除员工失败：员工企业信息设置有误！");
-        }
-
-        if(num <= 1){
-            return R.error("删除失败，公司仅剩一个账号");
-        }
-        // 获取直播间绑定信息
-        List<Long> bindUsers = mySysUserBrandService.queryBrandIdList(userId);
-        if (!ObjectUtils.isEmpty(bindUsers)) {
-            // 获取该公司下管理员手机号
-            List<SysUserEntity> userEntities = sysUserService.getSysUserListByDeptIds(Arrays.asList(deptId));
-            List<String> phones = userEntities.stream().filter(user -> !user.getUserId().equals(userId))
-                    .map(SysUserEntity::getMobile).collect(Collectors.toList());
-
-            if(ObjectUtils.isEmpty(phones)){
-                return R.error("删除失败，公司仅剩一名员工，不可进行删除！");
+        if(!ObjectUtils.isEmpty(deptId)){
+            // 更新企业员工信息
+            long num = sysUserService.getUserNumOfDept(deptId);
+            if(num <= 1){
+                return R.error("删除失败，公司仅剩一个账号");
+            }
+            // 获取直播间绑定信息
+            List<Long> bindUsers = mySysUserBrandService.queryBrandIdList(userId);
+            if (!ObjectUtils.isEmpty(bindUsers)) {
+                // 获取该公司下管理员手机号
+                List<SysUserEntity> userEntities = sysUserService.getSysUserListByDeptIds(Arrays.asList(deptId));
+                List<String> phones = userEntities.stream().filter(user -> !user.getUserId().equals(userId))
+                        .map(SysUserEntity::getMobile).collect(Collectors.toList());
+                if(ObjectUtils.isEmpty(phones)){
+                    return R.error("删除失败，公司仅剩一名员工，不可进行删除！");
+                }
+                return R.ok().put("list", phones);
             }
-            return R.ok().put("list", phones);
         }
         return R.ok();
     }