1、通讯录调整

2、新闻列表返回是否已读状态

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -63,9 +63,10 @@ public class ConcatController {
         }
         MPJLambdaWrapper<XjrUser> wrapper = new MPJLambdaWrapper<>();
         wrapper.leftJoin("xjr_user_dept_relation t2 on t.id = t2.user_id")
-                .eq("t2.dept_id", parentId)
+                .like("t4.hierarchy", parentId + "-")
                 .leftJoin("xjr_user_role_relation t3 ON t.id = t3.user_id")
                 .leftJoin("xjr_role t4 ON t4.id = t3.role_id")
+                .leftJoin("xjr_department t5 ON t2.dept_id = t4.id")
                 .eq("t4.id", 2)
                 .eq(StrUtil.isNotEmpty(dto.getName()), XjrUser::getName, dto.getName())
                 .eq(StrUtil.isNotEmpty(dto.getMobile()), XjrUser::getMobile, dto.getMobile())

src/main/java/com/xjrsoft/module/oa/vo/NewsPageVo.java

@@ -184,4 +184,7 @@ public class NewsPageVo {
 
     @ApiModelProperty("封面")
     private Long cover;
+
+    @ApiModelProperty("是否已读(1:是 0:否)")
+    private Integer readMark;
 }

src/main/resources/mapper/oa/NewsMapper.xml

@@ -33,8 +33,14 @@
             resultType="com.xjrsoft.module.oa.vo.NewsPageVo">
         select
         t.*,t2.name as create_user_name
+        <if test="dto.type != null and dto.type == 2 and dto.loginId != null">
+            ,t3.read_mark
+        </if>
         from xjr_oa_news t
         left join xjr_user t2 on t.create_user_id = t2.id
+        <if test="dto.type != null and dto.type == 2 and dto.loginId != null">
+            left join xjr_oa_news_relation t3 on t.id = t3.news_id
+        </if>
         where t.delete_mark = 0 and
         (t.send_end_date > now() or t.send_end_date is null)
           and t.status = 2