From 7ff2ed6246eb0903026277f15539f5ce7d6b4a30 Mon Sep 17 00:00:00 2001
From: tiezx <tiezx@zstu.edu.cn>
Date: Thu, 17 Jul 2025 12:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=83=BD=E5=A4=9F?=
 =?UTF-8?q?=E5=AF=B9=E4=BE=9B=E5=BA=94=E7=AB=AF=E7=9A=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=AE=E6=94=B9=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QsSupplierServiceImpl.java   | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/quotation-system/src/main/java/net/ferrum/business/service/impl/QsSupplierServiceImpl.java b/quotation-system/src/main/java/net/ferrum/business/service/impl/QsSupplierServiceImpl.java
index 40572b0..53f7a9a 100644
--- a/quotation-system/src/main/java/net/ferrum/business/service/impl/QsSupplierServiceImpl.java
+++ b/quotation-system/src/main/java/net/ferrum/business/service/impl/QsSupplierServiceImpl.java
@@ -6,18 +6,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import net.ferrum.business.domain.QsSupplier;
 import net.ferrum.business.domain.QsUserSupplier;
 import net.ferrum.business.domain.bo.QsSupplierBo;
 import net.ferrum.business.domain.vo.QsSupplierVo;
+import net.ferrum.business.domain.vo.QsUserSupplierVo;
 import net.ferrum.business.mapper.QsSupplierMapper;
 import net.ferrum.business.mapper.QsUserSupplierMapper;
 import net.ferrum.business.service.IQsSupplierService;
 import net.ferrum.common.core.domain.PageQuery;
 import net.ferrum.common.core.page.TableDataInfo;
 import net.ferrum.common.utils.StringUtils;
+import net.ferrum.system.domain.SysUserRole;
 import net.ferrum.system.domain.vo.SysUserBasicInfoVo;
 import net.ferrum.system.mapper.SysUserMapper;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -48,14 +52,16 @@ public class QsSupplierServiceImpl implements IQsSupplierService {
     @Override
     public QsSupplierVo queryById(Long supplierId){
         QsSupplierVo result = supplierMapper.selectVoById(supplierId);
-        List<QsUserSupplier> relations = userSupplierMapper.selectList(new LambdaQueryWrapper<QsUserSupplier>().eq(QsUserSupplier::getSupplierId, supplierId));
-        List<SysUserBasicInfoVo> userInfos = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(relations)) {
-            relations.forEach(relation -> {
-                userInfos.add(userMapper.selectUserBasicInfoById(relation.getUserId()));
-            });
-        }
-        result.setDockerUsers(userInfos);
+        List<QsUserSupplierVo> relations = userSupplierMapper.selectUsersbySupplierId(supplierId);
+//        List<QsUserSupplier> relations = userSupplierMapper.selectList(new LambdaQueryWrapper<QsUserSupplier>().eq(QsUserSupplier::getSupplierId, supplierId));
+//        List<SysUserBasicInfoVo> userInfos = new ArrayList<>();
+//        if (!CollectionUtils.isEmpty(relations)) {
+//            relations.forEach(relation -> {
+//                userInfos.add(userMapper.selectUserBasicInfoById(relation.getUserId()));
+//            });
+//        }
+//        result.setDockerUsers(userInfos);
+        result.setDockerUsers(relations);
         return result;
     }
 
@@ -66,6 +72,7 @@ public class QsSupplierServiceImpl implements IQsSupplierService {
     public TableDataInfo<QsSupplierVo> queryPageList(QsSupplierBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<QsSupplier> lqw = buildQueryWrapper(bo);
         Page<QsSupplierVo> result = supplierMapper.selectVoPage(pageQuery.build(), lqw);
+
         return TableDataInfo.build(result);
     }
 
@@ -141,7 +148,13 @@ public class QsSupplierServiceImpl implements IQsSupplierService {
     public Boolean claimSuppliers(Collection<Long> supplierIds, Long userId) {
         List<QsUserSupplier> relations = new ArrayList<>(0);
         supplierIds.forEach(id -> {
-            relations.add(new QsUserSupplier(userId, id));
+            //relations.add(new QsUserSupplier(userId, id));
+
+            QsUserSupplier t = new QsUserSupplier();
+            t.setUserId(userId);
+            t.setSupplierId(id);
+            relations.add(t);
+
         });
         return userSupplierMapper.insertBatch(relations);
     }
@@ -150,7 +163,12 @@ public class QsSupplierServiceImpl implements IQsSupplierService {
     public Boolean resignSuppliers(Collection<Long> userIds, Long supplierId) {
         List<QsUserSupplier> relations = new ArrayList<>(0);
         userIds.forEach(id -> {
-            relations.add(new QsUserSupplier(id, supplierId));
+            //relations.add(new QsUserSupplier(id, supplierId));
+
+            QsUserSupplier t = new QsUserSupplier();
+            t.setUserId(id);
+            t.setSupplierId(supplierId);
+            relations.add(t);
         });
         return userSupplierMapper.insertBatch(relations);
     }