diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index f75ddad66..ff3cc4d94 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -31,7 +31,7 @@ public class WxContractBaseController extends BaseController{ map.put("remark", remark); //租金+物业合同时用到 if (null != wholeProperyId) { - map.put("businessId", String.valueOf(contractId)+"$"+String.valueOf(wholeProperyId)); + map.put("businessId", String.valueOf(contractId)+"_RP_"+String.valueOf(wholeProperyId)); map.put("wholeProperyId", String.valueOf(wholeProperyId)); }else { map.put("businessId", String.valueOf(contractId)); @@ -46,7 +46,7 @@ public class WxContractBaseController extends BaseController{ contractNumberMap.put("key","contractNumber"); //租金+物业合同时用到 if (null != wholeProperyId) { - contractNumberMap.put("value", String.valueOf(contractId)+"$"+String.valueOf(wholeProperyId)); + contractNumberMap.put("value", String.valueOf(contractId)+"_RP_"+String.valueOf(wholeProperyId)); }else { contractNumberMap.put("value", String.valueOf(contractId)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 189e6555b..25bdf338e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -151,7 +151,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { return wxRentPropertyContractService.getContractInfo(rentId,propertyId); }else if (StringUtils.isBlank(id)) { //租金+物业工作流查询会传此id - String[] ids = id.split("$"); + String[] ids = id.split("_RP_"); if (ids.length == 2 ) { Long rId = Long.parseLong(ids[0]); Long pId = Long.parseLong(ids[1]); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c7a5ff4c0..de92478a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -184,9 +184,9 @@ public class WxFlowServiceImpl implements WxFlowService { //租金+合同的bussinessId 特殊 Long bsId = 0L; Long propetyId = 0L; - if (businessId.contains("$")) { - bsId = Long.parseLong(businessId.split("$")[0]); - propetyId = Long.parseLong(businessId.split("$")[1]); + if (businessId.contains("_RP_")) { + bsId = Long.parseLong(businessId.split("_RP_")[0]); + propetyId = Long.parseLong(businessId.split("_RP_")[1]); }else { bsId = Long.parseLong(businessId); } @@ -272,9 +272,9 @@ public class WxFlowServiceImpl implements WxFlowService { //租金+合同的bussinessId 特殊 Long bsId ; Long propetyId; - if (businessId.contains("$")) { - bsId = Long.parseLong(businessId.split("$")[0]); - propetyId = Long.parseLong(businessId.split("$")[1]); + if (businessId.contains("_RP_")) { + bsId = Long.parseLong(businessId.split("_RP_")[0]); + propetyId = Long.parseLong(businessId.split("_RP_")[1]); }else { bsId = Long.parseLong(businessId); }