core

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/VehicleUploadRequest.java

@@ -117,7 +117,7 @@ public class VehicleUploadRequest extends AbstractSignTypeRequest<VehicleUploadR
             validator.validFieldNotNull("axleCount", axleCount);
         }
         // 牵引车必填字段
-        if (useUserType == 0) {
+        if (useUserType != 0) {
             validator.validFieldNotBlank("roadTransportPermitPicUrl", roadTransportPermitPicUrl);
             validator.validFieldNotBlank("licenseIdNum",licenseIdNum);
         }
@@ -131,12 +131,15 @@ public class VehicleUploadRequest extends AbstractSignTypeRequest<VehicleUploadR
         validator.validFieldNotBlank("ownerIdNum",ownerIdNum);
         validator.validFieldNotBlank("ownerIdAddress",ownerIdAddress);
         validator.validFieldNotBlank("ownerPosImgUrl",ownerPosImgUrl);
-        validator.validFieldNotBlank("proxyUrl",proxyUrl);
 
         if (ownerIdType != null && IdType.SFZ.getCode()== ownerIdType){
             validator.validFieldNotBlank("ownerNegImgUrl",ownerNegImgUrl);// 单位的填不上,个人必填
             validator.validFieldNotBlank("ownerTel",ownerTel);
         }
     }
+    //订单是个人非本人
+    public void ownerValid2(ErrorMsgBuilder validator) {
+        validator.validFieldNotBlank("proxyUrl",proxyUrl);
+    }
 
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueAgreementAddressRepo.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
+import java.util.List;
 
 public interface IssueAgreementAddressRepo extends AbstractJpaRepo<IssueAgreementAddress, String>{
 
@@ -24,4 +25,7 @@ public interface IssueAgreementAddressRepo extends AbstractJpaRepo<IssueAgreemen
 
     @Query(" from IssueAgreementAddress where refId = ?1 and status = ?2")
     IssueAgreementAddress findByRefIdAndStatus(String refId, EnableStatus status);
+
+    @Query(" from IssueAgreementAddress where refId in ?1 and status = ?2")
+    List<IssueAgreementAddress> findByRefIdAndStatusList(List<String> refId, EnableStatus status);
 }