Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java

@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 隐患区域配置类型信息表Service实现
@@ -228,8 +229,12 @@
    }
    @Override
    public   List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) {
        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(pageWrap);
        pageWrap.setIsdeleted(Constants.ZERO);
        HiddenDangerParam hiddenDangerParam = new HiddenDangerParam();
        hiddenDangerParam.setIsdeleted(Constants.ZERO);
        if(Objects.nonNull(pageWrap.getId())){
            hiddenDangerParam.setId(pageWrap.getId());
        }
        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
        List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper);
        List<Member> memberList = new ArrayList<>();
        if(list!=null){
@@ -252,6 +257,7 @@
                        .leftJoin(Company.class, Company::getId,Member::getCompanyId)
                        .eq(Member::getType,Constants.TWO)
                        .eq(Member::getIsdeleted,Constants.ZERO)
                        .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName())
                        .in(Member::getId,idList)
                );
            }