Merge pull request '1.28功能提交' (#126) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
4 years ago · 8d9ca939d6
parent e9be27136f 25ec474c1c
commit 8d9ca939d6
1 changed files with 7 additions and 7 deletions
--- a/Application/Admin/Controller/UserController.class.php
+++ b/Application/Admin/Controller/UserController.class.php
@ -394,13 +394,13 @@ class UserController extends AdminController
                }
            }

-            if (strtotime($_POST['apply_leave_time'])<time()) {
-                $this->error('申请离职时间不能早于当前时间！');
-            }
-
-            if (strtotime($_POST['leave_time'])<time()) {
-                $this->error('离职时间不能早于当前时间！');
-            }
+//            if (strtotime($_POST['apply_leave_time'])<time()) {
+//                $this->error('申请离职时间不能早于当前时间！');
+//            }
+//
+//            if (strtotime($_POST['leave_time'])<time()) {
+//                $this->error('离职时间不能早于当前时间！');
+//            }

            if (strtotime($_POST['apply_leave_time'])>strtotime($_POST['leave_time'])) {
                $this->error('申请离职时间不得晚于离职时间！');