From 6bfb4f714690d8d53f8b89dc1fd1cc7b921065fd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 16 Aug 2022 10:47:58 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=88=86=E6=A0=87=E5=A7=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 8 ++++---- .../PayCaseCommitteeSubitemController.java | 2 +- .../mapper/PayCaseCommitteeSubitemMapper.java | 1 + .../xml/PayCaseCommitteeSubitemMapper.xml | 19 +++++++++++++++++++ .../IPayCaseCommitteeSubitemService.java | 3 ++- .../PayCaseCommitteeSubitemServiceImpl.java | 9 +++++++-- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 9681a673..c6838759 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -982,11 +982,11 @@ public class PayContactsManagementController extends JeroController baseInfo() { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //查出来人 - LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); - queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername()); - PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement); + //LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); + //queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername()); + //PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement); //查出来企业 - PayCompanyManagement company = payCompanyManagementService.getById(contacts.getCompanyId()); + PayCompanyManagement company = payCompanyManagementService.getById(sysUser.getCompanyId()); Map baseInfo = memberInfoService.baseInfo(company); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 3082c9c2..3efcc9cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -139,7 +139,7 @@ public class PayCaseCommitteeSubitemController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCommitteeSubitemService.listThreeTwo(page,sysUser.getId(),fenBiaoWeiNames); + IPage pageList = payCaseCommitteeSubitemService.listThreeTwo(page,sysUser,fenBiaoWeiNames); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java index 9df556b1..350f9d75 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java @@ -34,5 +34,6 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper listThreeTwo(Page page, @Param("id") String id, @Param("fenBiaoWeiName") String fenBiaoWeiName); + IPage listThreeTwoByCompany(Page page, @Param("companyId") String companyId, @Param("fenBiaoWeiName") String fenBiaoWeiName); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index e2607664..f7960f4e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -156,4 +156,23 @@ order by pm.create_time desc + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index 98040f6c..176308b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.system.vo.LoginUser; import com.jero.data.entity.*; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; @@ -31,6 +32,6 @@ public interface IPayCaseCommitteeSubitemService extends IService chooseExcel(ArrayList idList); - IPage listThreeTwo(Page page, String id, String fenBiaoWeiNames); + IPage listThreeTwo(Page page, LoginUser loginUser, String fenBiaoWeiNames); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 889ca101..1e742169 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; import com.jero.data.entity.*; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; @@ -57,7 +58,11 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl listThreeTwo(Page page, String id, String fenBiaoWeiNames) { - return payCaseCommitteeSubitemMapper.listThreeTwo(page,id,fenBiaoWeiNames); + public IPage listThreeTwo(Page page, LoginUser loginUser, String fenBiaoWeiNames) { + if (loginUser.getIsCompanyManager()) { + return payCaseCommitteeSubitemMapper.listThreeTwoByCompany(page, loginUser.getCompanyId(),fenBiaoWeiNames); + }else{ + return payCaseCommitteeSubitemMapper.listThreeTwo(page, loginUser.getId(),fenBiaoWeiNames); + } } }