From ea98bdf9ad0aef4577c0bdfe7c5fea97e208fb19 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 14 Mar 2022 16:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=BF=E8=88=8D=E6=99=9A?=
 =?UTF-8?q?=E5=BD=92=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Acc_DormitoryRuleController.cs       |  5 -----
 .../Views/Acc_DormitoryRule/Form.cshtml              | 12 ++++--------
 .../Views/Acc_DormitoryRule/Index.js                 |  3 +--
 .../Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs     |  5 -----
 .../Acc_DormitoryRule/Acc_DormitoryRuleService.cs    |  6 +++++-
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs
index 043d4af3e..fdb4f9134 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs	
@@ -114,11 +114,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
                 return Fail("晚归时间格式不正确！");
             }
 
-            if (!(entity.PushHour >= 0 && entity.PushHour <= 23))
-            {
-                return Fail("推送时间点填写不正确！");
-            }
-
             var model = acc_DormitoryRuleIBLL.GetEnableEntity();
             if (entity.IsEnable == 1)
             {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml
index 100ee31f8..6a6c120e0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml	
@@ -7,19 +7,15 @@
         <div class="lr-form-item-title">晚归时间<font face="宋体">*</font></div>
         <input id="LateReturnTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分，例如：22:00" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
+    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
         <div class="lr-form-item-title">推送人<font face="宋体">*</font></div>
-        <div id="PushUser" isvalid="yes" checkexpession="NotNull"></div>
+        <div id="PushUser" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
+    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
         <div class="lr-form-item-title">推送班主任<font face="宋体">*</font></div>
         <div id="ClassDiredctor"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
-        <div class="lr-form-item-title">推送时间点<font face="宋体">*</font></div>
-        <input id="PushHour" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写0-23数字" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
+    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
         <div class="lr-form-item-title">启用<font face="宋体">*</font></div>
         <div id="IsEnable"></div>
     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js
index 4b81ce7c9..cd1b97a40 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js	
@@ -66,7 +66,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').jfGrid({
+            $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList',
                 headData: [
                     { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" },
@@ -113,7 +113,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "推送时间点", name: "PushHour", width: 100, align: "left" },
                     {
                         label: "启用", name: "IsEnable", width: 100, align: "left",
                         formatter: function (cellvalue, rowObject) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs
index 351f0e912..61fab88f7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs	
@@ -35,11 +35,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("CLASSDIREDCTOR")]
         public int? ClassDiredctor { get; set; }
         /// <summary>
-        /// 推送时间点
-        /// </summary>
-        [Column("PUSHHOUR")]
-        public int? PushHour { get; set; }
-        /// <summary>
         /// 是否启用
         /// </summary>
         [Column("ISENABLE")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs
index 751c2f837..01ff3c3f7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs	
@@ -32,7 +32,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.*
+                t.Id,
+                t.LateReturnTime,
+                t.PushUser,
+                t.ClassDiredctor,
+                t.IsEnable
                 ");
                 strSql.Append("  FROM Acc_DormitoryRule t ");
                 strSql.Append("  WHERE 1=1 ");