Просмотр исходного кода

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

ZhaoMn 4 лет назад
Родитель
Сommit
12bb71a856

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

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcab;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.enums.JcebOrderFieldEnum;
 import com.railway.business.catenary.enums.JcebStatusEnum;
+import com.railway.business.catenary.enums.SortTypeEnum;
 import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
@@ -60,15 +61,19 @@ public abstract class BusJcabServiceImpl {
     List<String> fieldList = Arrays.stream(fields).map(Field::getName).collect(Collectors.toList());
     // 如果排序字段不是BusJcab类的属性时,取默认排序字段
     log.info("前端指定的排序字段 - {}", jcab.getOrderBy());
-    if (StringUtils.isNotEmpty(jcab.getOrderBy()) && fieldList.contains(jcab.getOrderBy())) {
+    if (StringUtils.isNotEmpty(jcab.getOrderBy())) {
       jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
       if (JcebOrderFieldEnum.OPERATION_DATE.getField().equals(jcab.getOrderBy())) {
         jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getField());
       }
+      if(!fieldList.contains(jcab.getOrderBy())){
+        log.info("排序字段名在当前表不存在 - {}", jcab.getOrderBy());
+        jcab.setOrderBy(null);
+      }
     } else {
       // 默认倒序排列
       jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getField());
-      jcab.setIsAsc("0");
+      jcab.setIsAsc(SortTypeEnum.DESC.getCode());
     }
     log.info("最终使用的排序字段 - {}", jcab.getOrderBy());
   }