fix: 更新签到逻辑

guzijian
1 parent 30ce9c1f
Showing 1 changed file with 2 additions and 4 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -232,10 +232,8 @@ public class SignInServiceImpl implements ISignInService {
         result = checkWorkDay(signIn, driver.getPosts());
  
         // 酒精测试校验 确定 且员工工种是驾驶员
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && result) {
-            if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) > 0) {
-                result = true;
-            } else {
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
+            if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0)  {
                 signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR);
                 result = false;
             }