Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

partner/src/main/resources/mapper/PartnerUserMapper.xml

@@ -54,7 +54,7 @@
         leader.`name` AS leaderIdName,
         (SELECT sum(pd.extract_fee) FROM partner_premium_details pd WHERE pd.user_id = db.user_id AND pd.is_delete = 0) kickback,
         (SELECT sum(distinct pr.sumpremium) FROM partner_premium_details pr WHERE pr.user_id = db.user_id AND pr.is_delete = 0) premium,
-        ( SELECT GROUP_CONCAT( s.type_attr SEPARATOR ',' ) FROM sys_user_jzg_info_salesman s WHERE s.sys_user_jzg_info_id = info.id AND s.is_delete = 0 ) AS typeAttr
+        ( SELECT GROUP_CONCAT( s.type_attr SEPARATOR ',' ) FROM sys_user_jzg_info_salesman s WHERE s.type_attr in (3,6) and s.sys_user_jzg_info_id = info.id AND s.is_delete = 0 ) AS typeAttr
         FROM
         (
         SELECT

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/service/impl/RenBaoNewCrawlerRequestImpl.java

@@ -1939,7 +1939,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
     private LoginInfoBO getLoginInfo(AttributionInformationVo attributionInfo) {
         RenBaoNewCrawlerConfigureParameters parameters = ConfigureParametersConversion
                 .conversionEntity(RenBaoNewCrawlerConfigureParameters.class, attributionInfo.getConfigInfo());
-        String jwt = requestComponent.getJwtToken(parameters.getCarChecker());
+        String jwt = requestComponent.getJwtToken(parameters.getUserCode());
         if(jwt.isEmpty()){
             jwt = attributionInfo.getPassword();
         }