Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -36,11 +36,11 @@
     </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,o.name organ_name,a.full_name area_name
-        from t_user u
-        left join t_organ o on o.id = u.org_id
+        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
+        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_area a on u.area_id = a.id
-        inner join t_box_operation b on b.organ_id = o.id
         where 1=1
         <if test="user.orgId!= null and user.orgId != '' ">
             and b.organ_id =#{user.orgId}