Alex 4 năm trước cách đây
mục cha
commit
13b94cc39a

+ 5 - 1
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -136,6 +136,10 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         return AjaxResult.success();
     }
 
+    public AppMemberVo getMemberDetail(Long familyId) {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+        return null;
+    }
     @Override
     public List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
@@ -164,7 +168,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             return new ArrayList<>();
         }
         lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
-
+        lqw.eq(AppMemberVo::getStatus,"2");
         if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
             lqw.and(
                     i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()

+ 1 - 1
ruoyi-system/src/main/resources/mapper/app/TbFamilyMemberMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectFamilyMember" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
-        select u.id user_id,m.id member_id,u.mobile,u.qrcode,u.nick_name, m.name,m.gender,m.birthday,m.spouse_user_id,mi.status,m.state,
+        select u.id user_id,m.id member_id,u.mobile,u.qrcode,u.nick_name,u.avatar, m.name,m.gender,m.birthday,m.spouse_user_id,mi.status,m.state,
         (select mm.name from tb_family_member mm where mm.app_user_id = m.spouse_user_id) spouse,
         mi.parent_id,(select me.name from tb_family_member me where mi.parent_id = me.id) parent_name,
         (select mm.name from tb_family_member mm where mm.app_user_id = (select me.spouse_user_id from tb_family_member me where mi.parent_id = me.id)) mother_name