luobang 2 anos atrás
pai
commit
72b9f99f2f

+ 6 - 6
src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -317,12 +317,12 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     public int allowEnFactory(Map<String, Object> map){
         List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList"); //获取勾选列表
         if( ! (mapList == null || mapList.size() == 0)){
-//            if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
-//                boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
-//                if( ! judgeRowIdOrder){
-//                    return -1;
-//                }
-//            }
+            if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
+                boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
+                if( ! judgeRowIdOrder){
+                    return -1;
+                }
+            }
         }else {
             return -2;
         }

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -1031,7 +1031,7 @@
                 ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQL.IS_VIP, "listNodeOrder"
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQSL.IS_VIP, "listNodeOrder"
             </if>
     </select>