提交初始化配置

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ReservationBlacklistController.java

 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.BlacklistStatus;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +44,9 @@ public class ReservationBlacklistController extends BaseController
     @Autowired
     private IReservationBlacklistService reservationBlacklistService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询黑名单
 列表
@@ -49,6 +57,24 @@ public class ReservationBlacklistController extends BaseController
     {
         startPage();
         List<ReservationBlacklist> list = reservationBlacklistService.selectReservationBlacklistList(reservationBlacklist);
+
+        if (StringUtils.isNotEmpty(list)){
+            List<String> personNos = list.stream().map(ReservationBlacklist::getPersonNo).collect(Collectors.toList());
+
+            personNos.add("default");
+
+            SysUser user = new SysUser();
+            user.setUserNames(personNos);
+            Map<String, SysUser> userMap = userService.selectUserList(user)
+                    .stream().collect(Collectors.toMap(SysUser::getUserName, Function.identity()));
+
+            for (ReservationBlacklist blacklist : list) {
+                 blacklist.setSysUser(userMap.getOrDefault(blacklist.getPersonNo(),new SysUser()));
+            }
+
+        }
+
+
         return getDataTable(list);
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -10,12 +11,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
 
 /**
  * Entity基类
  * 
  * @author ruoyi
  */
+@Data
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
@@ -51,6 +54,10 @@ public class BaseEntity implements Serializable
     @TableField(exist = false)
     private Map<String, Object> params;
 
+
+    @TableField(exist = false)
+    private List<String> userNames;
+
     public String getSearchValue()
     {
         return searchValue;

ruoyi-system/src/main/java/com/ruoyi/system/domain/ReservationBlacklist.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -55,6 +56,9 @@ public class ReservationBlacklist extends BaseEntity
     /** 删除标记 */
     private String delFlag;
 
+    @TableField(exist = false)
+    private SysUser sysUser;
+
     public void setId(Long id) 
     {
         this.id = id;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SpaceSeat.java

@@ -29,6 +29,11 @@ public class SpaceSeat extends BaseEntity
     @Excel(name = "房间编码")
     private String spaceCode;
 
+    /**
+     * 说明
+     */
+    private String explanation;
+
     /** 座位名称 */
     @Excel(name = "座位名称")
     private String seatName;

ruoyi-system/src/main/resources/mapper/system/SpaceSeatMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="seatCode"  column="seat_code"/>
         <result property="spaceCode"    column="space_code"    />
         <result property="seatName"    column="seat_name"    />
+        <result property="explanation" column="explanation" />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSpaceSeatVo">
-        select seat_id, seat_code,space_code, seat_name, create_by, create_time, update_by, update_time, remark, del_flag from space_seat
+        select seat_id, seat_code,space_code, seat_name,explanation, create_by, create_time, update_by, update_time, remark, del_flag from space_seat
     </sql>
 
     <select id="selectSpaceSeatList" parameterType="SpaceSeat" resultMap="SpaceSeatResult">

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -82,6 +82,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+		<if test="userName != null and userNames.size >0 ">
+			AND u.user_name in
+			<foreach collection="userNames" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
@@ -144,8 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectUsersByUserName" resultType="com.ruoyi.common.core.domain.entity.SysUser">
 
-		select user_id, email from sys_user where  del_falg = '0'
-		 and user_name
+		select user_id,user_name, nick_name from sys_user where  del_flag = '0'
+		 and user_name in
          <foreach collection="userNames" item="item" open="(" close=")" separator=",">
 			 #{item}
 		 </foreach>