修改了对话查询接口和黑名单接口

src/main/java/org/rcisoft/business/memLeaveMessage/entity/MemLeaveMessage.java

@@ -125,5 +125,11 @@ public class MemLeaveMessage extends CyIdIncreNotDataEntity<MemLeaveMessage> {
       */
      @TableField(exist = false)
      private String targetMemCode;
+
+     /**
+      * 拉黑人id
+      */
+     @TableField(exist = false)
+     private Integer blackUser;
 }
 

src/main/java/org/rcisoft/business/memLeaveMessage/service/impl/MemLeaveMessageServiceImpl.java

@@ -135,6 +135,7 @@ public class MemLeaveMessageServiceImpl extends ServiceImpl<MemLeaveMessageRepos
                 memUserTalk.setCreateDate(new Date());
                 memUserTalk.setUpdateDate(new Date());
                 memUserTalk.setDelUser(0);
+                memUserTalk.setBlackUser(0);
                 int line1 = 0;
                 if (memUserTalks != null){
                     //如果已经存在该对话，则只更新信息
@@ -170,6 +171,7 @@ public class MemLeaveMessageServiceImpl extends ServiceImpl<MemLeaveMessageRepos
                 memUserTalk.setUpdateDate(new Date());
                 //留言未删除默认值为0
                 memUserTalk.setDelUser(0);
+                memUserTalk.setBlackUser(0);
                 if (memUserTalks != null){
                     //已经给该用户留过言
                     memUserTalk.setBusinessId(memUserTalks.getBusinessId());
@@ -213,6 +215,7 @@ public class MemLeaveMessageServiceImpl extends ServiceImpl<MemLeaveMessageRepos
             memUserTalk.setContent(memLeaveMessage.getContent());
             //留言未删除默认值为0
             memUserTalk.setDelUser(0);
+            memUserTalk.setBlackUser(0);
             int line1 = 0;
             if (memUserTalks != null){
                 //如果已经存在该对话，则只更新信息

src/main/java/org/rcisoft/business/opmBlacklist/service/impl/OpmBlackListServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang.StringUtils;
+import org.rcisoft.business.memLeaveMessage.dao.MemLeaveMessageRepository;
+import org.rcisoft.business.memLeaveMessage.entity.MemLeaveMessage;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.aop.CyPageUtilAsp;
 import org.rcisoft.core.model.CyPersistModel;
@@ -35,6 +37,8 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class OpmBlackListServiceImpl extends ServiceImpl<OpmBlackListRepository,OpmBlackList>  implements OpmBlackListService {
 
+    @Autowired
+    private MemLeaveMessageRepository memLeaveMessageRepository;
 
     /**
     * 保存 黑名单表
@@ -49,6 +53,12 @@ public class OpmBlackListServiceImpl extends ServiceImpl<OpmBlackListRepository,
         opmBlackList.setUserId(BigInteger.valueOf(userId));
         opmBlackList.setCreateDate(new Date());
         int line = baseMapper.insert(opmBlackList);
+        //添加到对话表设置拉黑用户
+        Integer targetId = opmBlackList.getTargetId().intValue();
+        //biginteger转int
+        MemLeaveMessage userTalk = memLeaveMessageRepository.queryUserTalk(userId, targetId);
+        userTalk.setBlackUser(userId);
+        memLeaveMessageRepository.updateUserTalk(userTalk);
         log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
             opmBlackList.getBusinessId()+"的黑名单表信息");
         return new CyPersistModel(line);

src/main/resources/mapper/business/memLeaveMessage/mapper/MemLeaveMessageMapper.xml

@@ -13,7 +13,8 @@
              update_by = #{createBy},
              update_date = #{updateDate},
              content = #{content},
-             del_user = #{delUser}
+             del_user = #{delUser},
+             black_user = #{blackUser}
         where business_id = #{businessId}
     </update>
     <select id="queryTalkByPagination" resultType="org.rcisoft.business.memLeaveMessage.entity.MemLeaveMessage">
@@ -29,6 +30,7 @@
         LEFT JOIN mem_info mi ON mi.user_id = mut.target_id
         WHERE mut.create_by = #{entity.createBy}
         and mut.del_user != #{entity.createBy}
+        and mut.black_user != #{entity.createBy}
         UNION ALL(
             SELECT
                 mut.business_id,
@@ -42,6 +44,7 @@
             LEFT JOIN mem_info mi ON mi.user_id = mut.create_by
             WHERE mut.target_id = #{entity.createBy}
               and mut.del_user != #{entity.createBy}
+              and mut.black_user != #{entity.createBy}
         )
         ORDER BY create_date DESC
     </select>