clunt
/
RuoYi
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-07-03 10:46:42 +08:00
parent 4012aa1887
commit d3fd5b956a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
View File

@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; 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.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
@ -28,6 +29,7 @@ import okhttp3.Response;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.tomcat.jni.User;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
@ -138,11 +140,15 @@ public class ClewController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo listPublic(Clew clew) public TableDataInfo listPublic(Clew clew)
{ {
SysUser sysUser=getSysUser();
startPage(); startPage();
clew.setSaleId(2L); clew.setSaleId(2L);
clew.setPoolStatus("01"); // 只显示公海池状态的线索 clew.setPoolStatus("01"); // 只显示公海池状态的线索
List<Clew> list = clewService.selectClewPublicList(clew); List<Clew> list = clewService.selectClewPublicList(clew);
list.forEach(model->{ list.forEach(model->{
if (!Objects.equals(sysUser.getLoginName(), "admin")){
model.setSourceSaleId(null);
}
if(model.getSaleId() != null){ if(model.getSaleId() != null){
SysUser user = sysUserService.selectUserById(model.getSaleId()); SysUser user = sysUserService.selectUserById(model.getSaleId());
if(user != null){ if(user != null){
@ -170,10 +176,15 @@ public class ClewController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo listQuality(Clew clew) public TableDataInfo listQuality(Clew clew)
{ {
SysUser sysUser=getSysUser();
startPage(); startPage();
clew.setSaleId(2L);
clew.setPoolStatus("02"); // 只显示优质线索池状态的线索 clew.setPoolStatus("02"); // 只显示优质线索池状态的线索
List<Clew> list = clewService.selectClewQualityList(clew); List<Clew> list = clewService.selectClewQualityList(clew);
list.forEach(model->{ list.forEach(model->{
if (!Objects.equals(sysUser.getLoginName(), "admin")){
model.setSourceSaleId(null);
}
if(model.getSaleId() != null){ if(model.getSaleId() != null){
SysUser user = sysUserService.selectUserById(model.getSaleId()); SysUser user = sysUserService.selectUserById(model.getSaleId());
if(user != null){ if(user != null){

2
ruoyi-admin/src/main/resources/templates/system/clew/publicClew.html
View File

@ -301,7 +301,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; 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>'); 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(''); return actions.join('');
} }

2
ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
View File

@ -265,7 +265,7 @@
update clew update clew
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="company != null">company = #{company},</if> <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="infoFlow != null and infoFlow != ''">info_flow = #{infoFlow},</if>
<if test="nextTime != null">next_time = #{nextTime},</if> <if test="nextTime != null">next_time = #{nextTime},</if>
<if test="wxName != null">wx_name = #{wxName},</if> <if test="wxName != null">wx_name = #{wxName},</if>