diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 34e49e87..383e3b2e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -167,6 +167,8 @@ public class PayCaseCommitteeController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - String userName=null; + String userId=null; if (roleCodes.contains(constant.XMFZR)){ - userName=sysUser.getUsername(); + userId=sysUser.getId(); } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userName); + IPage pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userId); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java index a3fbf7c8..a41935a4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java @@ -59,6 +59,8 @@ public class PayCaseCouncilController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - String userName=null; + String userId=null; if (roleCodes.contains(constant.XMFZR)){ - userName=sysUser.getUsername(); + userId=sysUser.getId(); } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userName); + IPage pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userId); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java index 760b4e9f..fd2e4aab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java @@ -45,6 +45,9 @@ public class PayCaseCommittee implements Serializable { /**创建人*/ @ApiModelProperty(value = "创建人") private java.lang.String createBy; + + @ApiModelProperty(value = "创建人id") + private java.lang.String createById; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java index 95b4e959..f95333e0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java @@ -50,6 +50,9 @@ public class PayCaseCouncil implements Serializable { /**创建人*/ @ApiModelProperty(value = "创建人") private java.lang.String createBy; + + @ApiModelProperty(value = "创建人id") + private java.lang.String createById; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") 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 c7c1646f..9df556b1 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 @@ -24,7 +24,7 @@ import java.util.List; */ public interface PayCaseCommitteeSubitemMapper extends BaseMapper { - IPage listThree (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userName") String userName); + IPage listThree (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userId") String userId); List listTwo (@Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java index 25b87954..0d68bf67 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface PayCaseCouncilSubitemMapper extends BaseMapper { - IPage listThree(Page page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userName") String userName); + IPage listThree(Page page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userId") String userId); List chooseExcel(@Param("idList")ArrayList idList); 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 73814501..0c44039e 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 @@ -31,8 +31,8 @@ AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') - - AND (pe.create_by = #{userName} or pme.director_name = #{userName}) + + AND (pe.create_by_id = #{userId} or pme.director_id = #{userId}) group by pe.id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index 555bdbfb..430529e0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -31,8 +31,8 @@ AND pe.name LIKE CONCAT('%',#{councilNames},'%') - - AND (pe.create_by = #{userName} or pme.director_name = #{userName}) + + AND (pe.create_by_id = #{userId} or pme.director_id = #{userId}) group by pe.id 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 9458c9fa..98040f6c 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 @@ -25,7 +25,7 @@ public interface IPayCaseCommitteeSubitemService extends IService listTwo(QueryWrapper queryWrapper); - IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userName); + IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userId); List listForExcel(String name, String companyName, String councilName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java index efd375ab..5078410c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface IPayCaseCouncilSubitemService extends IService { - IPage listThree(Page page,String contactsNames, String companyNames, String councilNames, String userName); + IPage listThree(Page page,String contactsNames, String companyNames, String councilNames, String userId); List listForExcel(String contactsNames, String companyNames, String councilNames); 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 e12fa74c..889ca101 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 @@ -41,8 +41,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userName) { - return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userName); + public IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userId) { + return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index d029ae1d..3809a93f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -26,8 +26,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl listThree(Page page, String contactsNames, String companyNames, String councilNames, String userName) { - return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userName); + public IPage listThree(Page page, String contactsNames, String companyNames, String councilNames, String userId) { + return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userId); } @Override