fix:分标委理事会权限问题

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java

@@ -167,6 +167,8 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		}
 		PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
 		BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
+		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		payCaseCommittee.setCreateById(sysUser.getId());
 		payCaseCommitteeService.save(payCaseCommittee);
 		return Result.OK("添加成功！");
 	}

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java

@@ -95,12 +95,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String roleCode = sysUser.getRoleCode();
 		List<String> 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<FindByName> page = new Page<>(pageNo, pageSize);
-		IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userName);
+		IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userId);
 		if (!CollectionUtils.isEmpty(pageList.getRecords())) {
 			try {
 				pageList.getRecords().forEach(p -> {

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java

@@ -59,6 +59,8 @@ public class PayCaseCouncilController extends JeroController<PayCaseCouncil, IPa
 		 }
 		 PayCaseCouncil payCaseCouncil1 = new PayCaseCouncil();
 		 BeanUtils.copyProperties(payCaseCouncil, payCaseCouncil1);
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 payCaseCouncil1.setCreateById(sysUser.getId());
 		 payCaseCouncilService.save(payCaseCouncil1);
 		 return Result.OK("添加成功！");
 	 }

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java

@@ -88,12 +88,12 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 String roleCode = sysUser.getRoleCode();
 		 List<String> 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<councilList> page = new Page<>(pageNo, pageSize);
-		 IPage<councilList> pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userName);
+		 IPage<councilList> pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userId);
 		 if (!CollectionUtils.isEmpty(pageList.getRecords())) {
 			 try {
 				 pageList.getRecords().forEach(p -> {

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")

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")

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<PayCaseCommitteeSubitem> {
 
-    IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userName") String userName);
+    IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userId") String userId);
 
     List<payCaseCommitteeSubitemVO> listTwo (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 

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<PayCaseCouncilSubitem> {
 
-    IPage<councilList> listThree(Page<councilList> page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userName") String userName);
+    IPage<councilList> listThree(Page<councilList> page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userId") String userId);
 
     List<ChooseExcelCouncil> chooseExcel(@Param("idList")ArrayList<String> idList);
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -31,8 +31,8 @@
             <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
-            <if test=" userName!=null and userName != ''">
+            <if test=" userId!=null and userId != ''">
-                AND (pe.create_by = #{userName} or pme.director_name = #{userName})
+                AND (pe.create_by_id = #{userId} or pme.director_id = #{userId})
             </if>
         </where>
         group by pe.id

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml

@@ -31,8 +31,8 @@
             <if test=" councilNames!=null and councilNames != ''">
                 AND pe.name LIKE CONCAT('%',#{councilNames},'%')
             </if>
-            <if test=" userName!=null and userName != ''">
+            <if test=" userId!=null and userId != ''">
-                AND (pe.create_by = #{userName} or pme.director_name = #{userName})
+                AND (pe.create_by_id = #{userId} or pme.director_id = #{userId})
             </if>
         </where>
         group by pe.id

jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java

@@ -25,7 +25,7 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 
-    IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userName);
+    IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userId);
 
     List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String councilName);
 

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<PayCaseCouncilSubitem> {
 
-    IPage<councilList> listThree(Page<councilList> page,String contactsNames, String companyNames, String councilNames, String userName);
+    IPage<councilList> listThree(Page<councilList> page,String contactsNames, String companyNames, String councilNames, String userId);
 
     List<ChooseExcelCouncil> listForExcel(String contactsNames, String companyNames, String councilNames);
 

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java

@@ -41,8 +41,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
     }
 
     @Override
-    public IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userName) {
+    public IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userId) {
-        return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userName);
+        return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userId);
     }
 
 

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java

@@ -26,8 +26,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl<PayCaseCouncil
     @Resource
     private PayCaseCouncilSubitemMapper payCaseCouncilSubitemMapper;
     @Override
-    public IPage<councilList> listThree(Page<councilList> page, String contactsNames, String companyNames, String councilNames, String userName) {
+    public IPage<councilList> listThree(Page<councilList> page, String contactsNames, String companyNames, String councilNames, String userId) {
-        return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userName);
+        return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userId);
     }
 
     @Override