diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 7b73d17d..c7e0494a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -112,6 +112,9 @@ public class SysCustomerController extends BaseController sysCustomerVo.setApplyUser(curUser.getLoginName()); } + String tempLoginName = sysCustomerService.convertName(sysCustomerVo); + sysCustomerVo.setBusinessMembers(tempLoginName); + startPage(); List list = sysCustomerService.selectSysCustomerList(sysCustomerVo); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java index b60804a3..4375acfa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import com.ruoyi.aftersales.domain.dto.CustomerDto; import com.ruoyi.system.domain.SysCustomer; +import com.ruoyi.system.domain.SysCustomerQuoteVo; import com.ruoyi.system.domain.SysCustomerVo; import com.ruoyi.system.domain.SysInvoice; import org.activiti.engine.runtime.ProcessInstance; @@ -115,4 +116,11 @@ public interface ISysCustomerService * 根据客户资料对象作废客户资料 * */ int cancelSysCustomerByObject(SysCustomer sysCustomer); + + + /** + * 通过用户名找到业务登录名,重新给业务员赋值 + * */ + String convertName(SysCustomerVo sysCustomerVo); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 58b5f2cb..fa4ac3c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -549,4 +549,17 @@ public class SysCustomerServiceImpl implements ISysCustomerService return sysCustomerMapper.updateSysCustomer(tempSysCustomer); } + + /** + * 通过用户名找到业务登录名,重新给业务员赋值 + * */ + @Override + public String convertName(SysCustomerVo sysCustomerVo) { + String businessMembers = sysCustomerVo.getBusinessMembers(); + if (StringUtils.isNotEmpty(businessMembers)){ + String loginName = userMapper.selectLoginNameByUserName(businessMembers); + return loginName; + } + return businessMembers; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 1130948c..e2607e46 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.export_sales = #{exportSales} and s.audit_status = #{auditStatus} and s.use_status = #{useStatus} - and s.business_members like concat('%',#{businessMembers}, '%') + and s.business_members = #{businessMembers} and s.enterprise_code like concat('%', #{enterpriseCode}, '%') and s.enterprise_name like concat('%', #{enterpriseName}, '%') and s.customer_purser like concat('%', #{customerPurser}, '%')