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

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

@@ -74,8 +74,10 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
         TUser user = tUserMapper.getById(id);
         if (user.getAreaId() != null) {
             String s = areaMapper.selectParent(user.getAreaId());
+            if (s!=null) {
                 user.setAreas(Arrays.asList(s.split(",")));
             }
+        }
         return user;
     }
 

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -23,9 +23,9 @@
     </sql>
 
     <select id="getList" resultMap="BaseResultMap">
-       SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,r.`name` organ_name
-FROM t_box_operation b
-left join t_organ r on r.id = b.organ_id
+        SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,r.`user_name` organ_name
+        FROM t_box_operation b
+        left join t_user r on r.org_id = b.organ_id and r.type = '3'
         where 1=1
         <if test="status!= null and status != '' ">
             and b.status =#{status}