From 7acaebcb01438578ded72491f39105db893982ef Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期二, 01 七月 2025 16:21:32 +0800 Subject: [PATCH] 修改 --- multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java | 19 ++++++++++++------- 1 files changed, 12 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 b90911f..9076692 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 @@ -1,5 +1,7 @@ package com.gkhy.exam.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.exam.common.api.CommonPage; import com.gkhy.exam.common.api.CommonResult; @@ -8,12 +10,10 @@ import com.gkhy.exam.common.exception.ApiException; import com.gkhy.exam.common.utils.PageUtils; import com.gkhy.exam.common.utils.SecurityUtils; -import com.gkhy.exam.system.domain.CompanyBasic; -import com.gkhy.exam.system.domain.Quality; -import com.gkhy.exam.system.domain.QualityTarget; -import com.gkhy.exam.system.domain.SysCompany; +import com.gkhy.exam.system.domain.*; import com.gkhy.exam.system.domain.req.QualityTargetReq; import com.gkhy.exam.system.domain.vo.QualityTargetVo; +import com.gkhy.exam.system.mapper.QualityDecomposeMapper; import com.gkhy.exam.system.mapper.QualityMapper; import com.gkhy.exam.system.mapper.QualityTargetMapper; import com.gkhy.exam.system.mapper.SysDeptMapper; @@ -23,8 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Wrapper; import java.time.LocalDateTime; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; @Service @@ -35,6 +38,8 @@ @Autowired private QualityTargetMapper qualityTargetMapper; @Autowired + private QualityDecomposeMapper qualityDecomposeMapper; + @Autowired private SysCompanyService sysCompanyService; @Autowired private SysDeptMapper sysDeptMapper; @@ -42,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("非管理员操作,查询条件不可为空"); } @@ -93,7 +98,7 @@ public CommonResult updateQuality(QualityTargetReq qualityTargetReq) { 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); //获取对应企业 @@ -102,7 +107,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()); -- Gitblit v1.9.2