16639036659
2024-05-14 964dd88319269c16d4ebb99007a954b51e625ef2
src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicRiskUnitServiceImpl.java
@@ -21,6 +21,7 @@
import com.gkhy.labRiskManage.domain.basic.service.BasicRiskUnitService;
import com.gkhy.labRiskManage.domain.riskReport.entity.RiskUnit;
import com.gkhy.labRiskManage.domain.riskReport.utils.GetRoleTagUtils;
import com.gkhy.labRiskManage.domain.riskReport.utils.SearchAuthUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -142,8 +143,10 @@
                if (queryParam.getRiskSourceType() != null && !queryParam.getRiskSourceType().equals("")){
                    predicateList.add(criteriaBuilder.equal(root.get("riskSourceType"), queryParam.getRiskSourceType()));
                }
                if (SearchAuthUtils.basicSearchAuth() == 1){
                if (roleTag == UserTagEnum.USER_TAG_0.getCode()){
                    predicateList.add(criteriaBuilder.equal(root.get("createByUserId"), currentUserId));
                    }
                }
                predicateList.add(criteriaBuilder.equal(root.get("deleteStatus"),StatusEnum.DELETE_NOT.getCode()));
                return criteriaBuilder.and(predicateList.toArray(new Predicate[0]));
@@ -295,6 +298,12 @@
        int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
        List<BasicRiskUnit> listResult = new ArrayList<>();
        if (SearchAuthUtils.basicSearchAuth() == 0){
            listResult = riskUnitRepository.listRiskUnit();
            return BeanCopyUtils.copyBeanList(listResult, RiskUnitListDTO.class);
        }
        if (roleTag != UserTagEnum.USER_TAG_0.getCode()){
           listResult = riskUnitRepository.listRiskUnit();
        }else {