diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index 5f386507..b115a659 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -98,6 +98,11 @@ public class SysCustomerQuoteController extends BaseController SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); Set roleKeys = roleService.selectRoleKeys(userId); + //通过用户名找到业务登录名,重新给业务员赋值 + String tempLoginName = sysCustomerQuoteService.convertName(sysCustomerQuoteVo); + sysCustomerQuoteVo.setBusinessMembers(tempLoginName); + + startPage(); List list = sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo); String loginName = ShiroUtils.getLoginName(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java index 64f847d4..b8a592dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java @@ -112,4 +112,9 @@ public interface ISysCustomerQuoteService * 根据供应商编码数组查询客户报价信息集合 * */ List selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes); + + /** + * 通过用户名找到业务登录名,重新给业务员赋值 + * */ + String convertName(SysCustomerQuoteVo sysCustomerQuoteVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 0e964248..60276398 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -104,10 +104,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public List selectSysCustomerQuoteList(SysCustomerQuoteVo sysCustomerQuoteVo) { + + + PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - //PageHelper 仅对第一List分页有效 Page list = (Page) sysCustomerQuoteMapper.selectSysCustomerQuoteList(sysCustomerQuoteVo); Page returnList = new Page<>(); @@ -167,6 +169,20 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { } + /** + * 通过用户名找到业务登录名,重新给业务员赋值 + * */ + @Override + public String convertName(SysCustomerQuoteVo sysCustomerQuoteVo) { + String businessMembers = sysCustomerQuoteVo.getBusinessMembers(); + if (StringUtils.isNotEmpty(businessMembers)){ + String loginName = userMapper.selectLoginNameByUserName(businessMembers); + return loginName; + } + return businessMembers; + } + + @Override @Transactional public int insertSysCustomerQuote(SysCustomerQuote sysCustomerQuote) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 39fbd81b..cb7fd69e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -164,4 +164,10 @@ public interface SysUserMapper */ @Select("select login_name from sys_user a,sys_user_role b,sys_role c where a.user_id = b.user_id and b.role_id = c.role_id and a.dept_id=#{deptId} and c.role_key= #{roleKey} and a.del_flag = 0 and a.status = 0") public String selectDeptLeaderId(@Param(value = "roleKey") String roleKey, @Param(value = "deptId") Long deptId); + + /** + * 通过用户名查询登录名 + * */ + String selectLoginNameByUserName(String businessMembers); + } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index ab79b235..54739445 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -264,4 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{roleKey} + + + \ No newline at end of file