Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -397,6 +397,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         String expiresIn = authCodeAndTime.getExpiresIn();
         //  公众号创建客户的id
         String customerId = this.getLoginUserCustomerId(tokenDto);
+        String userId = tokenDto.getUserId();
         Date expiresInTime = this.countExpirationTime(expiresIn);
 
 
@@ -438,7 +439,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 paCustomerServiceImpl.modifyCustomer(modifyCustomer);
 
                 // 管理员授权
-                CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(finalCustomerId);
+                CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId);
                 log.info("=======================公众号的客户id为："+finalCustomerId);
                 customerManager.setCustomerId(finalCustomerId);
                 operCrmOpenFeignClient.addManager(customerManager);