修改 TBoxOperationController==》》getTBoxOperationPageList 返回区域名称和用户名

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

@@ -82,6 +82,10 @@ public class TBoxOperation implements Serializable {
     @TableField(exist = false)
     private String organName;
 
+    @ApiModelProperty("用户名")
+    @TableField(exist = false)
+    private String userName;
+
     @ApiModelProperty("机构名")
     @TableField(exist = false)
     private String organCode;

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -16,6 +16,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="organ_name" property="organName"/>
         <result column="area_name" property="areaName"/>
+        <result column="user_name" property="userName"></result>
         <result column="permanent" property="permanent"/>
         <result column="effective_date" property="effectiveDate"/>
         <result column="exired_date" property="exiredDate"/>
@@ -74,7 +75,7 @@
     </select>
 
     <select id="selectPageList" 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
+        SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,r.name organ_name ,u.user_name
         FROM t_box_operation b
         left join t_organ r on r.id = b.organ_id
         left join t_user u on u.org_id = b.organ_id and u.type = '3'