我的信箱问题修复

cloud-site-service/src/main/java/com/yizhi/site/application/mapper/SystemMailboxMapper.java

@@ -15,8 +15,8 @@ import java.util.List;
  */
 public interface SystemMailboxMapper extends BaseMapper<SystemMailbox> {
 
-  List<SystemMailboxParamVo> selectMyPage(@Param("accountId") Long accountId, @Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
+  List<SystemMailboxParamVo> selectMyPage(@Param("accountId") Long accountId, @Param("type") Integer type, @Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
 
-  int selectMyCount(@Param("accountId") Long accountId);
+  int selectMyCount(@Param("accountId") Long accountId, @Param("type") Integer type);
 
 }

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SystemMailboxServiceImpl.java

@@ -150,9 +150,20 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy
     public Page<SystemMailboxParamVo> selectMyPage(Integer pageNo,Integer pageSize){
         pageNo = pageSize * (pageNo - 1);
         Long accountId = ContextHolder.get().getAccountId();
+        List<Long> roleIds =  myItemConfigmapper.getJjXxRoleCount(accountId);
+        Integer type = null;//信箱类型  1： 纪检   2: 书记,null没权限看 纪检和书记，只能看自己的
+        if(CollectionUtil.isNotEmpty(roleIds)){
+            if(roleIds.contains(1877604582759526400L)&&!roleIds.contains(1877605828904022016L)){
+            	type = 2;
+            }
+            if(!roleIds.contains(1877604582759526400L)&&roleIds.contains(1877605828904022016L)){
+            	type = 1;
+            }
+        }
+        
         Page<SystemMailboxParamVo> page = new Page<>(pageNo,pageSize);
-        page.setTotal(this.baseMapper.selectMyCount(accountId));
-        page.setRecords(this.baseMapper.selectMyPage(accountId,pageNo,pageSize));
+        page.setTotal(this.baseMapper.selectMyCount(accountId, type));
+        page.setRecords(this.baseMapper.selectMyPage(accountId, type, pageNo, pageSize));
         return page;
     }
 }

cloud-site-service/src/main/resources/mapper/SystemMailboxMapper.xml

@@ -18,7 +18,12 @@
                             system_mailbox
                         where
                             deleted = 0
+                            <if test="type != null">
+				                and type=#{type}
+				            </if>
+				            <if test="type == null">
                             	and create_by_id = #{accountId}
+                            </if>
                     union all
                         select
                             id,
@@ -47,7 +52,12 @@
                             system_mailbox
                         where
                             deleted = 0
+                            <if test="type != null">
+				                and type=#{type}
+				            </if>
+				            <if test="type == null">
                             	and create_by_id = #{accountId}
+                            </if>
                     union all
                         select
                             id,