From a10654d1cbf61574785d3083aa7d8083bebde3f6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 Nov 2020 17:12:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E4=BA=8E10.27?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E6=8A=8A=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=8F=82?= =?UTF-8?q?dto=E6=9B=BF=E6=8D=A2=E8=B0=83=E7=9A=84=E9=97=AE=E9=A2=98-PC?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=99=BB=E9=99=86=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CustomerStaffController.java | 2 +- .../src/main/java/com/epmet/dao/CustomerStaffDao.java | 2 +- .../main/java/com/epmet/service/CustomerStaffService.java | 2 +- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 6 +++--- .../src/main/resources/mapper/CustomerStaffDao.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index e8ae592334..e1eefc0a94 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -385,7 +385,7 @@ public class CustomerStaffController { * @Date 11:09 2020-08-25 **/ @PostMapping(value = "staffbasicinfo") - public Result staffBasicInfo(@LoginUser TokenDto tokenDTO){ + public Result staffBasicInfo(@LoginUser TokenDto tokenDTO){ return customerStaffService.selectStaffBasicInfo(tokenDTO.getUserId()); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index 457c88e2f6..acffa2840e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -189,7 +189,7 @@ public interface CustomerStaffDao extends BaseDao { * @Author zhangyong * @Date 10:07 2020-08-26 **/ - BasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId); + StaffBasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId); /** * 根据staffId查询用户基本信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index fe3c88e8fb..833791fc54 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -305,7 +305,7 @@ public interface CustomerStaffService extends BaseService { * @Author zhangyong * @Date 11:10 2020-08-25 **/ - Result selectStaffBasicInfo(String userId); + Result selectStaffBasicInfo(String userId); /** * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 17f0ae9f5e..c9a4388fb7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -650,9 +650,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl selectStaffBasicInfo(String userId) { - BasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId); - return new Result().ok(resultDTO); + public Result selectStaffBasicInfo(String userId) { + StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId); + return new Result().ok(resultDTO); } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 2dd23e4170..f5a341bf5b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -313,7 +313,7 @@ LIMIT 1 - SELECT cs.CUSTOMER_ID customerId, cs.USER_ID id, From dcace958e6b20d274397b9389eadb8bb81e3cc48 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 12 Nov 2020 13:41:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerStaffServiceImpl.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index c9a4388fb7..be351746dc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -623,7 +623,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl customerStaffList = baseDao.selectListCustomerStaffDTO(formDTO.getPhone()); - for (CustomerStaffDTO staffDTO : customerStaffList){ + //sun 2020.11.12 需求变更-之前pc工作端只能是工作端小程序的超级管理员能登陆 现调整为工作端小程序的工作人员均可登陆(使用账号密码登陆) start + /*for (CustomerStaffDTO staffDTO : customerStaffList){ // 2.根据 customer_id 去 gov_staff_role表，查询 customer_id + role_key = root_manager ,确定 根管理员的id，即roleId GovStaffRoleDTO roleKey = govStaffRoleDao.getRoleByCustomerIdAndRoleKey(staffDTO.getCustomerId(), RoleKeyConstants.ROLE_KEY_ROOT_MANAGER); if (null != roleKey){ @@ -645,7 +646,22 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO); + if (!customerInfo.success()) { + logger.error(String.format("获取客户信息失败，调用%s服务查询客户名称失败,入参%s", ServiceConstant.OPER_CRM_SERVER, JSON.toJSONString(staffDTO.getCustomerId()))); + } else { + if (null != customerInfo.getData()){ + CustomerListResultDTO resultDTO = new CustomerListResultDTO(); + resultDTO.setCustomerId(customerInfo.getData().getId()); + resultDTO.setCustomerName(customerInfo.getData().getCustomerName()); + listResultDTO.add(resultDTO); + } + } + } + //2020.11.12 sun end return new Result>().ok(listResultDTO); }