Explorar o código

LY 定期培训 超期和补赔

ly hai 1 ano
pai
achega
fd0afee20a

+ 4 - 4
master/src/main/java/com/ruoyi/project/training/controller/TTrainingbccDeviceController.java

@@ -77,14 +77,14 @@ public class TTrainingbccDeviceController extends BaseController
                     t.setIsLock(1);
                 }
             }
-            //判断是否5次不及格
-            if (t.getExamState() == -1) {
-                t.setIsLock(1);
-            }
             //如果补赔,可以
             if ("1".equals(t.getSupplementary())) {
                 t.setIsLock(0);
             }
+            //判断是否5次不及格
+            if (t.getExamState() == -1) {
+                t.setIsLock(1);
+            }
         }
         return getDataTable(list);
     }