1、司机证书请求参数为空处理；

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -518,11 +518,15 @@ public class KwfDriverService {
         KwfDriverCard driverCard = new KwfDriverCard();
         BeanUtils.copyProperties(params, driverCard);
         driverCard.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverCard.getCertificateMain()) && StringUtils.isBlank(driverCard.getCertificateRevolt())) {
+        String certificateMain = driverCard.getCertificateMain();
+        String certificateRevolt = driverCard.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverCard.setStatus(Global.NO);
             driverCard.setCertificateMain(Global.EMPTY_STRING);
             driverCard.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverCard.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverCard.getCertificateMain());
+        driverCard.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverCard.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -569,11 +573,15 @@ public class KwfDriverService {
         KwfDriverLicense driverLicense = new KwfDriverLicense();
         BeanUtils.copyProperties(params, driverLicense);
         driverLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverLicense.getCertificateMain()) && StringUtils.isBlank(driverLicense.getCertificateRevolt())) {
+        String certificateMain = driverLicense.getCertificateMain();
+        String certificateRevolt = driverLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverLicense.setStatus(Global.NO);
             driverLicense.setCertificateMain(Global.EMPTY_STRING);
             driverLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverLicense.getCertificateMain());
+        driverLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -621,11 +629,15 @@ public class KwfDriverService {
         KwfDriverQualification driverQual = new KwfDriverQualification();
         BeanUtils.copyProperties(params, driverQual);
         driverQual.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverQual.getCertificateMain()) && StringUtils.isBlank(driverQual.getCertificateRevolt())) {
+        String certificateMain = driverQual.getCertificateMain();
+        String certificateRevolt = driverQual.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverQual.setStatus(Global.NO);
             driverQual.setCertificateMain(Global.EMPTY_STRING);
             driverQual.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverQual.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverQual.getCertificateMain());
+        driverQual.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverQual.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -478,11 +478,15 @@ public class KwfTruckService {
         KwfTruckLicense truckLicense = new KwfTruckLicense();
         BeanUtils.copyProperties(params, truckLicense);
         truckLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(truckLicense.getCertificateMain()) && StringUtils.isBlank(truckLicense.getCertificateRevolt())) {
+        String certificateMain = truckLicense.getCertificateMain();
+        String certificateRevolt = truckLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             truckLicense.setStatus(Global.NO);
             truckLicense.setCertificateMain(Global.EMPTY_STRING);
             truckLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        truckLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : truckLicense.getCertificateMain());
+        truckLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : truckLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -520,11 +524,15 @@ public class KwfTruckService {
         KwfTransportLicense transportLicense = new KwfTransportLicense();
         BeanUtils.copyProperties(params, transportLicense);
         transportLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(transportLicense.getCertificateMain()) && StringUtils.isBlank(transportLicense.getCertificateRevolt())) {
+        String certificateMain = transportLicense.getCertificateMain();
+        String certificateRevolt = transportLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             transportLicense.setStatus(Global.NO);
             transportLicense.setCertificateMain(Global.EMPTY_STRING);
             transportLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        transportLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : transportLicense.getCertificateMain());
+        transportLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : transportLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;