From d3fd5b956a32de4e3962b310951a8b50fdfa5f5b Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 3 Jul 2025 10:46:42 +0800
Subject: [PATCH] no message

---
 .../ruoyi/web/controller/system/ClewController.java   | 11 +++++++++++
 .../resources/templates/system/clew/publicClew.html   |  2 +-
 .../src/main/resources/mapper/system/ClewMapper.xml   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
index 8e6a3a13..764b8cf2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
@@ -28,6 +29,7 @@ import okhttp3.Response;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.tomcat.jni.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -138,11 +140,15 @@ public class ClewController extends BaseController
     @ResponseBody
     public TableDataInfo listPublic(Clew clew)
     {
+        SysUser sysUser=getSysUser();
         startPage();
         clew.setSaleId(2L);
         clew.setPoolStatus("01"); // 只显示公海池状态的线索
         List<Clew> list = clewService.selectClewPublicList(clew);
         list.forEach(model->{
+            if (!Objects.equals(sysUser.getLoginName(), "admin")){
+                model.setSourceSaleId(null);
+            }
             if(model.getSaleId() != null){
                 SysUser user = sysUserService.selectUserById(model.getSaleId());
                 if(user != null){
@@ -170,10 +176,15 @@ public class ClewController extends BaseController
     @ResponseBody
     public TableDataInfo listQuality(Clew clew)
     {
+        SysUser sysUser=getSysUser();
         startPage();
+        clew.setSaleId(2L);
         clew.setPoolStatus("02"); // 只显示优质线索池状态的线索
         List<Clew> list = clewService.selectClewQualityList(clew);
         list.forEach(model->{
+            if (!Objects.equals(sysUser.getLoginName(), "admin")){
+               model.setSourceSaleId(null);
+            }
             if(model.getSaleId() != null){
                 SysUser user = sysUserService.selectUserById(model.getSaleId());
                 if(user != null){
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/publicClew.html b/ruoyi-admin/src/main/resources/templates/system/clew/publicClew.html
index c850f588..5eb34e33 100644
--- a/ruoyi-admin/src/main/resources/templates/system/clew/publicClew.html
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/publicClew.html
@@ -301,7 +301,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="getBackClew(\'' + row.id + '\')"><i class="fa fa-remove"></i>取回线索</a>');
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="getBackClew(\'' + row.id + '\')"><i class="fa fa-remove"></i>取回线索</a>');
                         actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="catchClew(\'' + row.id + '\')"><i class="fa fa-arrow-up"></i>捞取</a>');
                         return actions.join('');
                     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
index e4fe3988..7b3e7317 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
@@ -265,7 +265,7 @@
         update clew
         <trim prefix="SET" suffixOverrides=",">
             <if test="company != null">company = #{company},</if>
-            <if test="saleId != null">source_sale_id = sale_id, sale_id = #{saleId},</if>
+            <if test="saleId != null">source_sale_id = #{sourceSaleId}, sale_id = #{saleId},</if>
             <if test="infoFlow != null and infoFlow != ''">info_flow = #{infoFlow},</if>
             <if test="nextTime != null">next_time = #{nextTime},</if>
             <if test="wxName != null">wx_name = #{wxName},</if>