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

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

@@ -144,11 +144,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 		imGroupMemberDao.insert(imGroupMember);
 
-		imGroup.setMemberNum(imGroup.getMemberNum() + 1);
+		imGroup.setMemberNum(1);
 		imGroup.setUpdateTime(date);
 		imGroupDao.update(imGroup);
 
-		String groupId = imGroup.getId().toString();
+		String groupId = imGroup.getId();
 
 		GroupMember groupMember = new GroupMember(userId.toString(), groupId);
 		imFeignService.groupJoin(new GroupModel(groupId, new GroupMember[] { groupMember }, imGroup.getName()));
@@ -188,7 +188,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 		imGroupMemberDao.insert(imGroupMember);
 
-		imGroup.setMemberNum(imGroup.getMemberNum() + 1);
+		imGroup.setMemberNum(1);
 		imGroup.setUpdateTime(date);
 		imGroupDao.update(imGroup);
 
@@ -260,7 +260,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 				}
 			}
 			imGroupMemberDao.batchInsert(imGroupMemberList);
-			imGroup.setMemberNum(imGroup.getMemberNum() + imGroupMemberList.size());
+			imGroup.setMemberNum(imGroupMemberList.size());
 			imGroup.setUpdateTime(date);
 			imGroupDao.update(imGroup);
 
@@ -306,7 +306,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 		imGroupMemberDao.batchDelete(imGroupMemberList);
 
-		imGroup.setMemberNum(imGroup.getMemberNum() - userIdList.size());
+		imGroup.setMemberNum(-userIdList.size());
 		imGroup.setUpdateTime(new Date());
 		imGroupDao.update(imGroup);
 

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

@@ -9,14 +9,11 @@ import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.ImGroupMember;
-import com.ym.mec.biz.dal.page.GroupMemberQueryInfo;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
-import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
@@ -28,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

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

@@ -53,6 +53,10 @@ public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendG
 	@Transactional(rollbackFor = Exception.class)
 	public void sendGroupMessage(ImSendGroupMessage messageDto) throws Exception {
 		SysUser user = Optional.ofNullable(sysUserFeignService.queryUserInfo()).orElseThrow(() -> new BizException("用户不存在"));
+		String[] split = messageDto.getTargetIds().split(",");
+		if(split.length > 10){
+			throw new BizException("单次目标用户(群组)不可超过10");
+		}
 		messageDto.setSenderId(user.getId().toString());
 		messageDto.setOperator(user.getRealName());
 		if(Objects.isNull(messageDto.getSendTime())){

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

@@ -65,10 +65,7 @@
 			group_type_ = #{groupType},
 		</if>
 		<if test="memberNum != null">
-		member_num_ = #{memberNum},
-		</if>
-		<if test="id != null">
-		id_ = #{id},
+			member_num_ = member_num_ + #{memberNum},
 		</if>
 		<if test="tags != null">
 		tags_ = #{tags},
@@ -91,9 +88,6 @@
 		<if test="type != null">
 		type_ = #{type},
 		</if>
-		<if test="createTime != null">
-		create_time_ = #{createTime},
-		</if>
 		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="updateNickname">

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

@@ -1462,7 +1462,7 @@
                 AND (t.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>
             <if test="organId != null">
-                AND t.organ_id_ = #{organId}
+                AND FIND_IN_SET(t.organ_id_,#{organId})
             </if>
             <if test="subjectId != null">
                 AND FIND_IN_SET(#{subjectId},t.subject_id_)

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -162,7 +162,7 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("解散群")
 	@PostMapping(value = "/dismissGroup")
 	@AuditLogAnnotation(operateName = "解散群",interfaceURL = "imGroup/dismissGroup")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "String")})
+	@ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "String")
 	public Object dismissGroup(String imGroupId) {
 		imGroupService.dismissGroup(imGroupId);
 		return succeed();