Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RoomReservationUserSearch.java

@@ -20,6 +20,11 @@ public class RoomReservationUserSearch extends QueryInfo {
     @ApiModelProperty("用户编号/用户名/用户手机号")
     private String search;
 
+    @ApiModelProperty("声部id")
+    private Integer subjectId;
+
+    @ApiModelProperty("分部id")
+    private Integer organId;
 
     public String getRoomUid() {
         return roomUid;
@@ -38,4 +43,20 @@ public class RoomReservationUserSearch extends QueryInfo {
     public void setSearch(String search) {
         this.search = search;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -982,14 +982,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         
         //如果分部有企业信息，就用分部上的企业信息，否则用机构上的企业信息
         String companyName = null;
-        TenantInfo tenantInfo = null;
+        TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());;
         Organization organizationDto = organizationService.get(user.getOrganId());
 		if (organizationDto == null || StringUtils.isBlank(organizationDto.getCorporateName()) || StringUtils.isBlank(organizationDto.getCorporateCode())) {
-
-			tenantInfo = tenantInfoService.get(studentInfo.getTenantId());
-			if (tenantInfo == null) {
-				throw new BizException("机构信息不存在");
-			}
 			companyName = tenantInfo.getTsignName();
 		} else {
 			companyName = organizationDto.getCorporateName();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -1331,7 +1331,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
     @Override
     public PageInfo<RoomReservationUserVo> queryRoomUser(RoomReservationUserSearch query) {
-        IPage<RoomReservationUserVo> page = new Page<>(query.getPage(), query.getRows());
+        IPage<RoomReservationUserVo> page = PageUtil.getPage(query.getPage(), query.getRows());
         page = baseMapper.queryRoomUser(page, query);
         return PageUtil.pageInfo(page);
     }

mec-biz/src/main/resources/config/mybatis/ImLiveBroadcastRoomMapper.xml

@@ -223,18 +223,20 @@
         left join sys_user su on su.id_ = ilrr.user_id_
         left join organization o on o.id_ = su.organ_id_
         left join student s on s.user_id_ = su.id_
-        where ilrr.room_uid_ = #{query.roomUid}
-        <if test="query.search != null and query.search != ''">
-            and (su.id_ like concat('%',#{query.search},'%')
-            or su.phone_ like concat('%',#{query.search},'%')
-            or su.username_ like concat('%',#{query.search},'%'))
-        </if>
-        <if test="query.subjectId != null">
-            and find_in_set(#{query.subjectId},s.subject_id_list_)
-        </if>
-        <if test="query.organId != null">
-            and su.organ_id_ = #{query.organId}
-        </if>
+        <where>
+            ilrr.room_uid_ = #{query.roomUid}
+            <if test="query.search != null and query.search != ''">
+                and (su.id_ like concat('%',#{query.search},'%')
+                or su.phone_ like concat('%',#{query.search},'%')
+                or su.username_ like concat('%',#{query.search},'%'))
+            </if>
+            <if test="query.subjectId != null">
+                and find_in_set(#{query.subjectId},s.subject_id_list_)
+            </if>
+            <if test="query.organId != null">
+                and su.organ_id_ = #{query.organId}
+            </if>
+        </where>
     </select>
 
     <select id="querySchoolIds" resultType="string">