Merge branch 'dev'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -623,7 +623,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
     	// 1.根据手机号，去 customer_staff表，进行查询； 查询结果 多条：字段 customer_id，user_id
         List<CustomerStaffDTO> 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<CustomerStaffDao,
 					}
 				}
 			}
-        }
+        }*/
+		for (CustomerStaffDTO staffDTO : customerStaffList){
+			customerDTO.setId(staffDTO.getCustomerId());
+			Result<CustomerDTO> 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<List<CustomerListResultDTO>>().ok(listResultDTO);
 	}