From 3c513f9229a975af5b166370151650b80111ca81 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 31 Mar 2026 16:49:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/HiddenEvaluationDetailAddExe.java | 26 ++++++++++++++----- .../query/HiddenEvaluationRecordQueryExe.java | 2 +- .../dto/HiddenEvaluationDetailAddCmd.java | 2 +- .../dto/clientobject/HiddenStatisticsCO.java | 2 +- .../dataobject/EvaluationConfigDO.java | 3 +++ .../mapper/EvaluationConfigMapper.java | 2 +- .../impl/EvaluationConfigRepositoryImpl.java | 6 +---- .../mapper/EvaluationConfigMapper.xml | 14 ++++++++++ 8 files changed, 41 insertions(+), 16 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/HiddenEvaluationDetailAddExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/HiddenEvaluationDetailAddExe.java index 1d498b0..50a7365 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/HiddenEvaluationDetailAddExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/HiddenEvaluationDetailAddExe.java @@ -1,6 +1,7 @@ package com.zcloud.hidden.evaluation.command; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.hidden.evaluation.domain.enums.CompliantFlagEnum; import com.zcloud.hidden.evaluation.domain.enums.EvaluationResultEnum; import com.zcloud.hidden.evaluation.domain.gateway.HiddenEvaluationDetailGateway; @@ -11,10 +12,7 @@ import com.zcloud.hidden.evaluation.dto.HiddenEvaluationDetailAddCmd; import com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO; import com.zcloud.hidden.evaluation.persistence.dataobject.HiddenDO; import com.zcloud.hidden.evaluation.persistence.dataobject.HiddenEvaluationDetailDO; -import com.zcloud.hidden.evaluation.persistence.repository.EvaluationConfigRepository; -import com.zcloud.hidden.evaluation.persistence.repository.HiddenEvaluationDetailRepository; -import com.zcloud.hidden.evaluation.persistence.repository.HiddenEvaluationRecordRepository; -import com.zcloud.hidden.evaluation.persistence.repository.HiddenRepository; +import com.zcloud.hidden.evaluation.persistence.repository.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -43,14 +41,28 @@ public class HiddenEvaluationDetailAddExe { private final EvaluationConfigRepository evaluationConfigRepository; private final HiddenEvaluationDetailRepository hiddenEvaluationDetailRepository; private final HiddenRepository hiddenRepository; + private final CorpInfoRepository corpInfoRepository; @Transactional(rollbackFor = Exception.class) public boolean execute(HiddenEvaluationDetailAddCmd cmd) { List listByCorpId =evaluationConfigRepository.getListByCorpId(cmd.getCorpinfoId(), cmd.getEvaluationType()); - //判断当前人是否可以评论 - if (!listByCorpId.stream().anyMatch(config -> config.getUserId().equals(cmd.getEvaluationUserId()))) { - throw new BizException("当前用户没有权限评审"); + //判断当前人是否可以评论,，如果是企业登录，当前人所在的 企业也可以评审 + if(corpInfoRepository.checkCorp()){ + // 企业登录：验证当前企业是否在配置列表中 + if (!listByCorpId.stream().anyMatch(config -> + AuthContext.getTenantId().equals(config.getCorpinfoId()))) { + throw new BizException("当前企业没有权限评论"); + } + }else{ + // 个人登录：验证当前用户是否在配置列表中 + if (!listByCorpId.stream().anyMatch(config -> + AuthContext.getUserId().equals(config.getUserId()))) { + throw new BizException("当前用户没有权限评审"); + } } + + + HiddenDO hiddenDO = hiddenRepository.getByHiddenId(cmd.getHiddenId()); if (hiddenDO == null) { throw new BizException("隐患不存在"); diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java index 906c158..e6fede1 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java @@ -79,7 +79,7 @@ public class HiddenEvaluationRecordQueryExe { examCenterCOS.forEach(co -> { if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) { - co.setCurrentEvaluationFlag(true); + co.setCurrentEvaluationFlag(false); } }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationDetailAddCmd.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationDetailAddCmd.java index 26378a3..03df5be 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationDetailAddCmd.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvaluationDetailAddCmd.java @@ -22,7 +22,7 @@ import java.io.Serializable; @AllArgsConstructor public class HiddenEvaluationDetailAddCmd implements Serializable { - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @ApiModelProperty(value = "需要考评的企业id", name = "corpinfoId", required = true) @NotNull(message = "企业不能为空") private Long corpinfoId; @ApiModelProperty(value = "隐患id", name = "hiddenId", required = true) diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java index 2d539b1..65d88b7 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java @@ -43,7 +43,7 @@ public class HiddenStatisticsCO implements Serializable { @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") private String evaluationResult; @ApiModelProperty(value = "当前人是否考评过,true是,false否") - private Boolean currentEvaluationFlag = false; + private Boolean currentEvaluationFlag = true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationConfigDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationConfigDO.java index b377474..e26dbf5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationConfigDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationConfigDO.java @@ -28,6 +28,9 @@ public class EvaluationConfigDO extends BaseDO { //考评类型,1:安全类,2:环保类 @ApiModelProperty(value = "考评类型,1:安全类,2:环保类") private Integer evaluationType; + @ApiModelProperty(value = "企业id") + @TableField(exist = false) + private Long evalCorpinfoId; //部门id @ApiModelProperty(value = "部门id") private Long departmentId; diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/EvaluationConfigMapper.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/EvaluationConfigMapper.java index c3e3a04..a00cbee 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/EvaluationConfigMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/EvaluationConfigMapper.java @@ -22,6 +22,6 @@ public interface EvaluationConfigMapper extends BaseMapper { List listAll(Map params); - List getListByCorpId(Long corpinfoId); + List getListByCorpId(Long corpinfoId, Integer evaluationType); } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/EvaluationConfigRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/EvaluationConfigRepositoryImpl.java index 6be9fef..5472fe7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/EvaluationConfigRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/EvaluationConfigRepositoryImpl.java @@ -43,11 +43,7 @@ public class EvaluationConfigRepositoryImpl extends BaseRepositoryImpl getListByCorpId(Long corpinfoId, Integer evaluationType) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("corpinfo_id",corpinfoId); - queryWrapper.eq("evaluation_type",evaluationType); - - return list(queryWrapper); + return evaluationConfigMapper.getListByCorpId(corpinfoId,evaluationType); } } diff --git a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml index c80b087..8d4e011 100644 --- a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml @@ -72,5 +72,19 @@ order by ec.create_time desc + +