Merge branch 'dev_plugins' into dev_temp

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

@@ -619,7 +619,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	@Override
 	public Result<List<CustomerListResultDTO>> selectCustomerList(CustomerListFormDTO formDTO) {
         List<CustomerListResultDTO> listResultDTO = new ArrayList<>();
-        CustomerListResultDTO resultDTO = new CustomerListResultDTO();
         CustomerDTO customerDTO = new CustomerDTO();
     	// 1.根据手机号，去 customer_staff表，进行查询； 查询结果 多条：字段 customer_id，user_id
         List<CustomerStaffDTO> customerStaffList = baseDao.selectListCustomerStaffDTO(formDTO.getPhone());
@@ -637,6 +636,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
                     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);