Merge branch 'dev_v1.3.5_20220927'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberAuditServiceImpl.java

@@ -65,6 +65,7 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
         Map<String,Object> groupMemberParams = new HashMap<>(2);
         groupMemberParams.put("groupId",groupId);
         groupMemberParams.put("userId",imGroupMemberAudit.getUserId());
+        groupMemberParams.put("roleType",imGroupMemberAudit.getRoleType().getCode());
         if(Objects.nonNull(imGroupMemberService.getDao().findOne(groupMemberParams))){
             throw new BizException("您已经在群聊中，请勿重复添加");
         }
@@ -72,6 +73,7 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
         Map<String,Object> auditParams = new HashMap<>(3);
         auditParams.put("groupId",groupId);
         auditParams.put("userId",imGroupMemberAudit.getUserId());
+        groupMemberParams.put("roleType",imGroupMemberAudit.getRoleType().getCode());
         auditParams.put("auditStatus",AuditStatusEnum.AUDITING.getCode());
         if(Objects.nonNull(baseMapper.findOne(auditParams))){
             throw new BizException("您有待审核的申请，请勿重复提交");

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMemberAuditMapper.xml

@@ -47,6 +47,9 @@
             <if test="userId != null">
                 AND user_id_ = #{userId}
             </if>
+            <if test="roleType != null">
+                AND role_type_ = #{roleType}
+            </if>
             <if test="auditStatus != null and auditStatus != ''">
                 AND audit_status_ = #{auditStatus}
             </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMemberMapper.xml

@@ -44,6 +44,9 @@
             <if test="userId != null">
                 AND user_id_ = #{userId}
             </if>
+            <if test="roleType != null">
+                AND role_type_ = #{roleType}
+            </if>
         </where>
         LIMIT 1
     </select>