【CHG】兼容检查表筛选排序字段名

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -62,16 +62,16 @@ public abstract class BusJcabServiceImpl {
     // 如果排序字段不是BusJcab类的属性时，取默认排序字段
     log.info("前端指定的排序字段 - {}", jcab.getOrderBy());
     if (StringUtils.isNotEmpty(jcab.getOrderBy())) {
-      if (JcebOrderFieldEnum.OPERATION_DATE.getAttribute().equals(jcab.getOrderBy())) {
-        jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getAttribute());
-      }
-      if (!fieldList.contains(jcab.getOrderBy())
-          && !JcebOrderFieldEnum.CHECK_DATE.getField().equals(jcab.getOrderBy())) {
-        log.info("排序字段名在当前表不存在 - {}", jcab.getOrderBy());
-        jcab.setOrderBy(null);
-        jcab.setIsAsc(null);
-      } else {
+      if (JcebOrderFieldEnum.OPERATION_DATE.getAttribute().equals(jcab.getOrderBy())
+          || JcebOrderFieldEnum.OPERATION_DATE.getField().equals(jcab.getOrderBy())
+          || JcebOrderFieldEnum.CHECK_DATE.getAttribute().equals(jcab.getOrderBy())
+          || JcebOrderFieldEnum.CHECK_DATE.getField().equals(jcab.getOrderBy())) {
+        jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getField());
+      } else if (fieldList.contains(jcab.getOrderBy())) {
         jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
+      } else {
+        log.info("排序字段名在当前表不存在 - {}", jcab.getOrderBy());
+        jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getField());
       }
     } else {
       // 默认倒序排列