customer|addsql调整

@@ -17,10 +17,10 @@ public interface ConsignmentExtMapper {
     Long findAllCount(ConsignmentQuery query);
     Long findAllCount(ConsignmentQuery query);
 
 
     @Select("SELECT * FROM ( " +
     @Select("SELECT * FROM ( " +
-            "SELECT * FROM T_BIZ_CONSIGNMENT " +
-            "WHERE CONSIGNMENT_CODE = #{consignmentCode} " +
-            "AND CREATE_TIME >= SYSDATE - 30 " +
-            "ORDER BY CREATE_TIME DESC" +
+            "SELECT t.* FROM T_BIZ_CONSIGNMENT t " +
+            "WHERE t.CONSIGNMENT_CODE = #{consignmentCode} " +
+            "AND t.CREATE_TIME >= SYSDATE - 30 " +
+            "ORDER BY t.CREATE_TIME DESC" +
             ") WHERE ROWNUM = 1")
             ") WHERE ROWNUM = 1")
     Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
     Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
 
 

@@ -48,6 +48,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
              if (!StringUtils.isEmpty(bo.getShipperAccount())){
              if (!StringUtils.isEmpty(bo.getShipperAccount())){
                  if (Objects.equals(user.getAccountNo(),bo.getShipperAccount())){
                  if (Objects.equals(user.getAccountNo(),bo.getShipperAccount())){
                      return new ResponseUtils().success();
                      return new ResponseUtils().success();
+                 }else {
+                     /**
+                      * 不存在运单，并且没有填写shipperAccount，则直接返回
+                      */
+                     return new ResponseUtils().success();
                  }
                  }
              }else {
              }else {
                  /**
                  /**

 package com.fedex.connect.common.dependencies.util;
 package com.fedex.connect.common.dependencies.util;
 
 
 import com.fedex.connect.common.dependencies.annotation.BaseNotBlank;
 import com.fedex.connect.common.dependencies.annotation.BaseNotBlank;
-import com.fedex.connect.common.dependencies.exception.OpErrorException;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -37,7 +37,7 @@ public class BaseValidateUtils {
                 if (Objects.nonNull(annotation)) {
                 if (Objects.nonNull(annotation)) {
                     Object value = AssignmentFieldUtils.getFieldValue(obj, field.getName());
                     Object value = AssignmentFieldUtils.getFieldValue(obj, field.getName());
                     if(value instanceof String){
                     if(value instanceof String){
-                        String str = String.valueOf(value);
+                        String str = (String)value;
                         if(!StringUtils.hasText(str)){
                         if(!StringUtils.hasText(str)){
                             String fieldName = localeMessageUtil.getMessage(annotation.describe());
                             String fieldName = localeMessageUtil.getMessage(annotation.describe());
                             errorList.add(fieldName);
                             errorList.add(fieldName);

@@ -21,6 +21,6 @@ public class DicEntriesController extends BaseController implements IDicEntriesC
     @ApiOperation(value = "ResponseVo", notes = "获取所有国家字典信息")
     @ApiOperation(value = "ResponseVo", notes = "获取所有国家字典信息")
     public ResponseVo getCountryAll(){
     public ResponseVo getCountryAll(){
         List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
         List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
-        return ResponseVo.succ(countryList);
+        return responseUtils.success(countryList);
     }
     }
 }
 }