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

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -733,12 +733,12 @@ public class TUserController extends BaseController {
             user.setType("4");
 
             boolean ret = this.userService.save(user);
-
-            TUserRole userRole = new TUserRole();
-            userRole.setUserId(user.getId());
-            userRole.setRoleId("4");
-            userRole.setIsDeleted(false);
-            tUserRoleService.save(userRole);
+//
+//            TUserRole userRole = new TUserRole();
+//            userRole.setUserId(user.getId());
+//            userRole.setRoleId("4");
+//            userRole.setIsDeleted(false);
+//            tUserRoleService.save(userRole);
 
             if (!ret) {
                 // 新增失败, 500

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -60,9 +60,10 @@
     </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,r.`name` organ_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
         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'
         where 1=1
         <if test="tBoxOperation.organId != null and tBoxOperation.organId != '' ">
             and b.organ_id =#{tBoxOperation.organId}