From 31df666440095e84b258f795efb3f4e6b218ec63 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Thu, 27 Feb 2025 09:57:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AF=84=E4=BB=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/teammodel/repository/AppraiseRepository.java | 4 ++-- .../java/cn/teammodel/service/impl/EvaluationServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/teammodel/repository/AppraiseRepository.java b/src/main/java/cn/teammodel/repository/AppraiseRepository.java index 4cfe6ef..42f3df1 100644 --- a/src/main/java/cn/teammodel/repository/AppraiseRepository.java +++ b/src/main/java/cn/teammodel/repository/AppraiseRepository.java @@ -31,8 +31,8 @@ public interface AppraiseRepository extends CosmosRepository { */ @Query("SELECT * FROM School AS s where s.code = 'Appraise' and s.schoolId = 'template'") List findTemplateTree(); - @Query("SELECT value n FROM School AS s join n in s.nodes where s.code = @code and n.id = @nodeId") - List findNodeById(@Param("code") String code, @Param("nodeId") String nodeId); + @Query("SELECT value n FROM School AS s join n in s.nodes where s.code = @code and n.id = @nodeId and s.periodId = @periodId") + List findNodeById(@Param("code") String code, @Param("nodeId") String nodeId,@Param("periodId") String periodId); @Query("select n.id, n.name from School as c join n in c.nodes where c.code = @code and n.id in (@ids)") List findAllByCodeAndIdIn(String code, Set ids); @Query("SELECT c.id, c.achievementRules FROM School AS c where c.code = 'Appraise' and c.schoolId = @schoolId and c.periodId = @periodId") diff --git a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java index 61fa439..31387ba 100644 --- a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java +++ b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java @@ -350,7 +350,7 @@ public class EvaluationServiceImpl implements EvaluationService { } // 获取评价项节点 - List nodes = appraiseRepository.findNodeById(PK.PK_APPRAISE, appraiseId); + List nodes = appraiseRepository.findNodeById(PK.PK_APPRAISE, appraiseId,periodId); AppraiseTreeNode appraiseTreeNode = RepositoryUtil.findOne(nodes, "该评价项不存在"); if (appraiseTreeNode.getPath() == null) { throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "仅能评价三级评价项");