修改协议

src/main/java/com/ydtech/modules/esm/dao/EsmInsCompanyMapper.java

@@ -15,19 +15,14 @@ public interface EsmInsCompanyMapper extends BaseMapper<EsmInsCompany> {
     @Select("select version()")
     String getVersion();
 
-    default List<String> getByLowerId(String companyId){
+    default List<String> getByLowerId(String companyId) {
         String version = getVersion();
-        String substring = version.substring(0, 3);
-        if("5.7".equals(substring)){
+        if (version.contains("5.7")) {
             return getByLowerId57(companyId);
-        }else {
+        } else {
             return getByLowerId80(companyId);
         }
     }
 
 
 }
-
-
-
-

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -24,6 +24,7 @@ import com.ydtech.modules.protocol.entity.vo.PtlAgreementSaveVo;
 import com.ydtech.modules.protocol.service.*;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -136,7 +137,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 // 供应商类型
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
                 // 合作公司
-                .in(!lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
+                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()), PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 录入时间
                 .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
         Page<PtlAgreement> agreementPage = page(ptlAgreementPage, wrapper);