From 213b03673d07fd2d7818e34e9aa3bef5391eb30a Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 21 Jan 2019 11:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81&?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=BD=A6=E8=BE=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxFlowServiceImpl.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml | 2 +- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 4cc76f9c9..9fc67037e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -151,7 +151,7 @@ public class WxFlowServiceImpl implements WxFlowService { List mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); for (MallUserInfo mallUserInfo:mallUserInfoList) { Map content = new HashedMap(); - content.put("userName",mallUserInfo.getName()); + content.put("userName",starterInfo.getName()); content.put("page", Constant.adminPage); content.put("modelName","代办通知"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index f043e4732..e48e747b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -503,7 +503,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { String id = request.getParameter("id"); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); - + logger.info("----------id:{},getFilename:{}",id,wxRentContract.getFilename()); String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); String filename = UUID.randomUUID() + filesuffix; String filepath = Constant.fileDirectory; diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index b7a391586..d56b1362d 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -10,7 +10,7 @@ - + `id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index f07091b0b..7f65c60b9 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -101,7 +101,7 @@ f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName, - s.addr + s.addr,rc.apply_status from wx_property_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_floor f on s.floor=f.id