From a8a6760635f0642a2cbf61854b5587d9d0944985 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 11 七月 2025 17:20:36 +0800
Subject: [PATCH] 新功能加问题修复
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
index 18d3bd5..210e558 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
@@ -47,7 +47,7 @@
@Override
public CommonPage selectQualityList(Quality quality) {
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
- if (!admin){
+ if (!SecurityUtils.adminUser()){
if (quality.getCompanyId()==null){
throw new RuntimeException("非管理员操作，查询条件不可为空");
}
@@ -56,6 +56,10 @@
List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
+ for (QualityTarget qualityTarget : qualityTargets) {
+ List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
+ qualityTarget.setQualityTargetMesses(qualityTargetMesses);
+ }
qualityTargetVo.setQualityTargets(qualityTargets);
}
return CommonPage.restPage(qualityTargetVos);
@@ -96,13 +100,9 @@
@Override
public CommonResult updateQuality(QualityTargetReq qualityTargetReq) {
- List<Quality> qualities = qualityMapper.selectQualityByType(qualityTargetReq);
- if (qualities.size()>0){
- throw new ApiException("企业下已有相关数据，请删除后重试，或进行修改");
- }
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
List<QualityTarget> qualityTargets = qualityTargetReq.getQualityTargets();
- List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
+// List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
Quality quality = new Quality();
BeanUtils.copyProperties(qualityTargetReq,quality);
//获取对应企业
@@ -111,7 +111,7 @@
quality.setUpdateBy(loginUser.getUsername());
quality.setUpdateTime(LocalDateTime.now());
int insert = qualityMapper.updateQualityById(quality);
- qualityTargetMapper.deleteByQualityIds(collect);
+ qualityTargetMapper.deleteByQualityIds(qualityTargetReq.getId());
for (QualityTarget qualityTarget : qualityTargets) {
qualityTarget.setQualityId(quality.getId());
qualityTarget.setCompanyId(qualityTargetReq.getCompanyId());
@@ -142,6 +142,10 @@
List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
+ for (QualityTarget qualityTarget : qualityTargets) {
+ List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
+ qualityTarget.setQualityTargetMesses(qualityTargetMesses);
+ }
qualityTargetVo.setQualityTargets(qualityTargets);
}
return CommonResult.success(qualityTargetVos);
--
Gitblit v1.9.2