修改bug

src/main/java/cn/wisenergy/chnmuseum/party/model/TBoxOperation.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -75,4 +76,16 @@ public class TBoxOperation implements Serializable {
     @TableField(exist = false)
     private String areaName;
 
+    @ApiModelProperty("是否永久用户")
+    @TableField(exist = false)
+    private Boolean permanent;
+
+    @ApiModelProperty("生效日期")
+    @TableField(exist = false)
+    private LocalDate effectiveDate;
+
+    @ApiModelProperty("失效日期")
+    @TableField(exist = false)
+    private LocalDate exiredDate;
+
 }

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -15,6 +15,9 @@
         <result column="update_time" property="updateTime"/>
         <result column="organ_name" property="organName"/>
         <result column="area_name" property="areaName"/>
+        <result column="permanent" property="permanent"/>
+        <result column="effective_date" property="effectiveDate"/>
+        <result column="exired_date" property="exiredDate"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -33,13 +36,15 @@
         <if test="areaId!= null and areaId != '' ">
             and r.area_id like concat(#{areaId}, '%')
         </if>
+        order by b.create_time desc
     </select>
 
     <select id="selectBoxPage" resultMap="BaseResultMap">
-        select b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,u.user_name organ_name,a.full_name area_name
+        select b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,u.user_name organ_name,a.full_name area_name,u.permanent permanent,
+        u.effective_date effective_date,u.exired_date exired_date
         from t_box_operation b
         left join t_organ o on b.organ_id = o.id
-        left join t_user u on u.org_id = b.organ_id and u.type = '3'
+        left join t_user u on u.org_id = b.organ_id and u.type = '3'  and u.is_deleted = false
         left join t_area a on u.area_id = a.id
         where 1=1
         <if test="user.orgId!= null and user.orgId != '' ">
@@ -54,8 +59,6 @@
         <if test="user.areaName != null and user.areaName != '' ">
             and b.area_id LIKE concat(#{user.areaName}, '%')
         </if>
-        and u.is_deleted = false
-        and u.type = 3
         order by b.create_time desc
     </select>
 
@@ -77,6 +80,7 @@
         <if test="tBoxOperation.areaName != null and tBoxOperation.areaName != '' ">
             and b.area_id LIKE concat(#{tBoxOperation.areaName}, '%')
         </if>
+        order by b.create_time desc
     </select>
 
 </mapper>