调整代码支持同一个业务员在不同租户下被邀请

platform/src/main/java/com/jzg/service/impl/PtlInsAttributionTemplateServiceImpl.java

@@ -146,6 +146,7 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
         log.info("获取协议属性信息：agreementId=[{}]",agreementId);
         PtlAgreement ptlAgreement = ptlAgreementService.getById(agreementId);
         AssertionUtils.isEmpty(ptlAgreement, "协议不存在");
+        log.info("agreementId=[{}],,,ptlAgreement=[{}]",agreementId, JSONUtil.toJsonStr(ptlAgreement));
 
         PtlAgreementAttribution ptlAgreementAttribution = agreementAttributionMapper.selectById(ptlAgreement.getAttributionId());
         AssertionUtils.isEmpty(ptlAgreementAttribution, "账号归属信息查询失败");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -35,6 +35,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -226,7 +227,7 @@ public class CompanyFactory {
         //设置归属信息
         HttpResult<PtlAgreementAttribution> agreementAttribution = platformClient.getAgreementAttribution(clauseDataVo.getOrder()
                 .getAgreementId());
-        AssertionUtils.isFail(agreementAttribution.getCode() == 500, "获取协议属性失败");
+        AssertionUtils.isFail(agreementAttribution.getCode() == 500, Objects.toString(agreementAttribution.getMsg(),"获取协议信息异常"));
         Map<String, String> fieldMap = agreementAttribution.getData().getFields().stream()
                 .map(obj -> new JSONObject((Map<String, Object>) obj))  // 转换为 JSONObject
                 .collect(Collectors.toMap(

tenant/insurance/quotation-summary/src/main/resources/mapper/SysQueryVehicleConfigMapper.xml

@@ -9,7 +9,7 @@
     </sql>
 
     <select id="getByType" resultType="com.jzg.commons.entity.dto.SysQueryVehicleConfigDTO">
-        select <include refid="Base_Column_List"/>
+        select *
         from sys_query_vehicle_config c
         left join sys_query_vehicle_url u
         on c.id = u.config_id

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoService.java

@@ -22,8 +22,8 @@ public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
 
     /**
      * 通过userId查询用户信息
-     * @param userId
-     * @return
+     * @param userId 用户序号
+     * @return SysUserJzgInfo 不同租户下的用户信息
      */
     SysUserJzgInfo getUserByUserId(String userId);
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -212,7 +212,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 SysUserJzgInfo userInfoJzgInfo = sysUserJzgInfoService.getUserByUserId(loginUserId);
                 jzgInfoId = userInfoJzgInfo.getId();
             }
-            log.info("jzgInfoId=[{}]", jzgInfoId);
+            log.info("查看成员下的业务员信息：成员的序号：jzgInfoId=[{}]", jzgInfoId);
             userInfoList = sysUserJzgInfoMapper.queryYwy(page, sysUserInfoListVo, systemCode, jzgInfoId
             );
         }else if("1".equals(sysUserInfoListVo.getIsMember())){