Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

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

@@ -13,10 +13,7 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPetMapper;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfMasterService;
import com.ruoyi.service.ZfPetService;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +22,7 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -67,6 +65,11 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -98,7 +101,7 @@
                        bean.setOwnData(0);
                    }
                }
        ).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }


@@ -192,6 +195,9 @@
        }
    }

    @Resource
    ZfLogService zfLogService;

    @Override
    public AjaxResult updateData(ZfPet zfPet) {
        ZInfoUser myself = zInfoUserService.getMyself();
@@ -207,6 +213,13 @@
        if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }

        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("魅宠");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);

        if(updateById(zfPet)){
            return AjaxResult.success();
@@ -300,11 +313,13 @@
        LambdaQueryWrapper<ZfPet> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfPet::getCreateTime);
        lqw.in(ZfPet::getFamilyId,familyIdList);
        lqw.eq(zfPet.getId()!=null,ZfPet::getId,zfPet.getId());
        lqw.like(StringUtils.isNotEmpty(zfPet.getIdNum()),ZfPet::getIdNum,zfPet.getIdNum());
        lqw.like(StringUtils.isNotEmpty(zfPet.getSecurityCode()),ZfPet::getSecurityCode,zfPet.getSecurityCode());
        lqw.like(StringUtils.isNotEmpty(zfPet.getType()),ZfPet::getType,zfPet.getType());
        lqw.like(StringUtils.isNotEmpty(zfPet.getName()),ZfPet::getName,zfPet.getName());
        lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
//        lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
        lqw.between(zfPet.getBirthStart()!=null && zfPet.getBirthEnd()!=null,ZfPet::getBirth,zfPet.getBirthStart(),zfPet.getBirthEnd());
        lqw.like(zfPet.getSex()!=null,ZfPet::getSex,zfPet.getSex());
        lqw.like(StringUtils.isNotEmpty(zfPet.getColor()),ZfPet::getColor,zfPet.getColor());
        lqw.like(StringUtils.isNotEmpty(zfPet.getProperties()),ZfPet::getProperties,zfPet.getProperties());