修改PeopleSea.java文件

zqy

3 天以前 ee02f5032743f3c0bd217cb6cf8ba03ee663c629

修改PeopleSea.java文件

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -75,6 +75,35 @@


    /**
     *  根据用户的id查询另外一个家族的全部成员信息
     *
     */
    @GetMapping("/getAnotherFamInfo/{userId}")
    public  AjaxResult getAnotherFamInfo(@PathVariable("userId") Long userId)
    {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setSysId(userId);
        System.out.println(userId);
        List<ZInfoUser> zInfoUsers = zInfoUserService.selectByCondition(zInfoUser);
        if(!zInfoUsers.isEmpty())
        {

            ZInfoUser zi = new ZInfoUser();
            zi.setUaid(zInfoUsers.get(0).getUaid());
            zi.setSysId(userId);

            ZInfoUser zss = zInfoUserService.selectByUaidAndUid(zi);

            return zInfoUserService.listAllFamilyPeople(zss.getClanId());
        //    return AjaxResult.success("查询成功",zss);
        }
        else
        {
            return AjaxResult.success("没有另外的家族信息", null);
        }
    }

    /**
     * 导出个人详细信息记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -121,6 +121,16 @@

    private Integer clanId;

    private String uaid;

    public String getUaid() {
        return uaid;
    }

    public void setUaid(String uaid) {
        this.uaid = uaid;
    }

    public void setClanId(Integer clanId) {
        this.clanId = clanId;
    }

 zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java

@@ -14,4 +14,6 @@
    private String peoples;

    private String hasAttachment;

    private String isHIde;
}

 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java

@@ -46,6 +46,8 @@
   // AjaxResult updateBySysId()
    List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);


    ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser);
    AjaxResult removeByUserName(List<String> userName);
    List<ZInfoUser> selectByFamId(long fid);
    AjaxResult searchMyRelation();

 zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.domain.PeopleSea;
@@ -62,13 +63,20 @@
                for (String pe : pes) {
                    lqw.like(ZfEvent::getPeople, pe);
                }
                peopleS.setIsHIde("否");
                lqw.eq(!StringUtils.isEmpty(peopleS.getIsHIde()), ZfEvent::getIsHide, "否");

                lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
                if(peopleS.getHasAttachment().equals("是"))
                if(peopleS.getHasAttachment()!=null&&peopleS.getHasAttachment().equals("是"))
                {
                    lqw.isNotNull(ZfEvent::getUrl);
                    System.out.println("not null!");
                    lqw.isNotNull(ZfEvent::getUrl).and(r->r.apply("url!=''"));
                }else
                {
                    lqw.eq(!StringUtils.isEmpty(peopleS.getHasAttachment()), ZfEvent::getUrl, "");

                }


              //  if(peopleS.getIsHIde()!=null)
                Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
                Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);


 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -231,6 +231,7 @@
    private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) {

        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());
        lqw.eq(zInfoUser.getUserId() != null, ZInfoUser::getUserId, zInfoUser.getUserId());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysAddress()), ZInfoUser::getAlwaysAddress, zInfoUser.getAlwaysAddress());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysPolice()), ZInfoUser::getAlwaysPolice, zInfoUser.getAlwaysPolice());
@@ -266,6 +267,21 @@
    }

    @Override
    public ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser) {
        LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        System.out.println(zInfoUser.getUserId());
        System.out.println(zInfoUser.getUaid());
        lambdaQueryWrapper.eq(!StringUtils.isEmpty(zInfoUser.getUaid()), ZInfoUser::getUaid, zInfoUser.getUaid())
                .ne(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());

        List<ZInfoUser> lis = list(lambdaQueryWrapper);
        if(!lis.isEmpty())
            return lis.get(0);
        else
            return null;
    }

    @Override
    public AjaxResult removeByUserName(List<String> userName) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));