新建用户的管理类型和查询用户时携带管理类型

src/main/java/cn/chnmuseum/party/mapper/TUserMapper.java

@@ -27,4 +27,6 @@ public interface TUserMapper extends BaseMapper<TUser> {
     List<TUser> getUserList(@Param("user") TUser user);
 
     List<TUser> getListByRole(Map<String, Object> map);
+
+    List<TUser> getUserRole(List<String> collect);
 }

src/main/java/cn/chnmuseum/party/model/TUser.java

@@ -164,9 +164,6 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private String jwtToken;
 
-    @TableField(exist = false)
-    private String roleId;
-
     @ApiModelProperty("开始日期")
     @TableField(exist = false)
     private LocalDateTime beginDate;
@@ -175,4 +172,11 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private LocalDateTime endDate;
 
+    @ApiModelProperty("新建管理员账号时的管理员类型")
+    @TableField(exist = false)
+    private String roleId;
+
+    @TableField(exist = false)
+    private String roleName;
+
 }

src/main/java/cn/chnmuseum/party/service/impl/TUserServiceImpl.java

@@ -14,13 +14,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <pre>
@@ -56,7 +59,14 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
     @Override
     public Page<TUser> getList(Page<TUser> page, TUser user) {
         List<TUser> list = tUserMapper.getList(page, user);
+        List<TUser> userList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(list)) {
+            List<String> collect = list.stream().map(TUser::getId).collect(Collectors.toList());
+            userList = tUserMapper.getUserRole(collect);
+        }
+
         for (TUser u : list) {
+            // 用户状态
             if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus()) || AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())) {
                 if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())) {
                     u.setStatusName("活跃");
@@ -66,7 +76,17 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
             } else {
                 u.setStatusName("待审核");
             }
+
+            // 用户管理员类型
+            for (TUser tUser : userList) {
+                if (u.getId().equals(tUser.getId())) {
+                    u.setRoleName(tUser.getRoleName());
+                    continue;
+                }
             }
+        }
+
+
         return page.setRecords(list);
     }
 

src/main/java/cn/chnmuseum/party/web/controller/LoginController.java

@@ -185,13 +185,16 @@ public class LoginController extends BaseController {
                 }
                 List<Role> roles = roleService.selectRoleByUserId(user.getId());
 
-                // 用户需要拥有“统计管理员”或“平台管理员”角色才能登录
-//                List<String> roleAliasList = roles.stream().map(Role::getAlias).collect(Collectors.toList());
-//                if (!roleAliasList.contains(ROLE_TJGLY) && !roleAliasList.contains(ROLE_XTGLY)) {
-//                    resultMap.put("resultCode", "400");
-//                    resultMap.put("message", "您登录的账号既不是平台用户账号也不是统计用户账号，不能查看大屏");
-//                    return resultMap;
-//                }
+                // 大屏登录时，用户需要拥有“统计管理员”或“平台管理员”角色才能登录
+                String administrator = request.getParameter("administrator");
+                if (StringUtils.isNotBlank(administrator) && "1".equals(administrator)) {
+                    List<String> roleAliasList = roles.stream().map(Role::getAlias).collect(Collectors.toList());
+                    if (!roleAliasList.contains(ROLE_TJGLY) && !roleAliasList.contains(ROLE_XTGLY)) {
+                        resultMap.put("resultCode", "400");
+                        resultMap.put("message", "您登录的账号既不是平台用户账号也不是统计用户账号，不能查看大屏");
+                        return resultMap;
+                    }
+                }
 
                 List<String> list1 = new ArrayList<>();
                 //获取当前用户角色拥有菜单

src/main/java/cn/chnmuseum/party/web/controller/TUserController.java

@@ -221,7 +221,7 @@ public class TUserController extends BaseController {
             }
             if ("2".equals(user.getType())) {
                 if (StringUtils.isBlank(user.getRoleId())) {
-                    resultMap.put("resultCode", "200");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "请选择管理员账号类型");
                     return resultMap;
                 }
@@ -369,7 +369,7 @@ public class TUserController extends BaseController {
                 }
                 if ("2".equals(user.getType())) {
                     if (StringUtils.isBlank(user.getRoleId())) {
-                        resultMap.put("resultCode", "200");
+                        resultMap.put("resultCode", "400");
                         resultMap.put("message", "请选择管理员账号类型");
                         return resultMap;
                     }

src/main/resources/mapper/TUserMapper.xml

@@ -148,4 +148,17 @@
         where u.org_id = #{org_id} and u.is_deleted = #{is_deleted} and ur.role_id =#{role_id}
     </select>
 
+    <select id="getUserRole" resultType="cn.chnmuseum.party.model.TUser">
+        select  u.id,r.id,r.name AS role_name
+        from t_user u
+        left join t_user_role_link ur on u.id = ur.user_id
+        left join t_role r on r.id = ur.role_id
+        where
+        u.type = 2
+        and u.id in
+          <foreach collection="collect" item="userId" open="(" close=")" separator=",">
+          #{userId}
+          </foreach>
+    </select>
+
 </mapper>