Merge remote-tracking branch 'origin/master'

jiangping

2024-05-27 f360321afa268f8d4e6c19e9a45eaf9f70c770b2

Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -17,10 +18,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Objects;
@@ -38,6 +39,9 @@

    @Autowired
    private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    public Integer create(HiddenDangerLog hiddenDangerLog) {
@@ -97,7 +101,7 @@
                        .selectAll(HiddenDangerLog.class)
                        .selectAs(SystemUser::getRealname,HiddenDangerLog::getCreateUserName)
                        .selectAs(SystemUser::getAvatar,HiddenDangerLog::getAvatar)
                        .selectAs(Company::getName,HiddenDangerLog::getCompanyName)
                        .selectAs(Company::getCompanyNamePath,HiddenDangerLog::getCompanyName)
                        .leftJoin(SystemUser.class,SystemUser::getId,HiddenDangerLog::getCreator)
                        .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                        .eq(Objects.nonNull(hiddenDangerLog.getHiddenDangerId()),HiddenDangerLog::getHiddenDangerId,hiddenDangerLog.getHiddenDangerId())
@@ -105,6 +109,14 @@
                        .eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
                        .orderByAsc(HiddenDangerLog::getCreateDate)
        );

        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        for (HiddenDangerLog bean:hiddenDangerLogList) {
            if(StringUtils.isNotBlank(bean.getAvatar())){
                bean.setAvatar(path + bean.getAvatar());
            }
        }
        return hiddenDangerLogList;
    }
  

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

@@ -202,7 +202,7 @@
        //检查是否必须答题，并且符合答题要求
        ProblemLog problemLog = isValidProblemLog(visits);
        //获取申请的海康访问门禁组信息
//        getHkDeviceRoles(visits,isERP);
        getHkDeviceRoles(visits,isERP);
        //检验拜访人是否合法
        Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&visits.getIdcardNo().length()!=18