Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-31 eac04935c1be00a6ba1cbb41233088216730be07

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -76,7 +76,7 @@
        AND  sd.`type` = #{dto.companyType}
      </if>
      <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,"/",","))
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
      </if>
    </where>
    ${orderByClause}

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

@@ -356,7 +356,6 @@
    @Override
    public List<Company> findList(Company company) {
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        company.setIsdeleted(Constants.ZERO);
        if (company.getId() != null) {
            queryWrapper.eq(Company::getId, company.getId());
        }
@@ -456,6 +455,7 @@
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
        queryWrapper.select("t1.name",Company::getParentName);
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.apply(" t.isdeleted = 0 ") ;
        queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
        queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"c.name",company.getParentName());

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

@@ -323,7 +323,7 @@
                .select("t4.company_name_path",HiddenDanger::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId)
                .leftJoin("company t4 on t1.company_id=t4.id")
                .leftJoin("company t5 on t3.company_id=t5.id");


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

@@ -1144,7 +1144,7 @@
        if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){
                queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t2.company_path,'/','')) ");
                queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
            }
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);