安全排查流程

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml

@@ -17,7 +17,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
-        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.cshtml

@@ -17,7 +17,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
-        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormView.cshtml

@@ -17,7 +17,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
-        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SafetyCheck/SafetyCheckService.cs

@@ -58,39 +58,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var user = LoginUserInfo.Get();
                 if (!user.isSystem) //超管/安全办
                 {
-                    var dept = this.BaseRepository().FindList<DepartmentEntity>(x => x.F_SchoolMaster == //user.realName);
-                "李明纯").ToList();
+                    var dept = this.BaseRepository().FindList<DepartmentEntity>(x => x.F_SchoolMaster == user.realName).ToList();
                     var depts = "";
 
-                    if (user.roleIds.Contains("9593aeff-a62b-45ea-bfd1-c9766669c1a8"))//分管领导
+                    if (user.roleIds.Contains("9593aeff-a62b-45ea-bfd1-c9766669c1a8") && dept.Count() > 0)//分管领导
                     {
-                        if (dept.Count() > 0)
+
+                        for (int i = 0; i < dept.Count(); i++)
                         {
-                            for (int i = 0; i < dept.Count(); i++)
+                            if (i == dept.Count() - 1)
                             {
-                                if (i == dept.Count()-1)
-                                {
-                                    depts += " t.Department= '" + dept[i].F_DepartmentId + "'";
-                                }
-                                else
-                                {
-                                    depts += "t.Department='" + dept[i].F_DepartmentId + "' or ";
-                                }
+                                depts += " t.Department= '" + dept[i].F_DepartmentId + "'";
+                            }
+                            else
+                            {
+                                depts += "t.Department='" + dept[i].F_DepartmentId + "' or ";
                             }
-                            strSql.Append(" and (" + depts + ")");
-                        }
-                        else
-                        {
-                            strSql.Append(" AND t.Department = '" + user.departmentId + "' ");
                         }
-                        strSql.Append(" and t.Name = '" + user.userId + "' ");
+                        strSql.Append(" and (" + depts + ")");
                     }
                     else if (user.roleIds.Contains("ab90ee97-c8e2-4bc9-80b4-68aff407c777"))//部门领导
                     {
                         strSql.Append(" AND t.Department = '" + user.departmentId
-                            + "' and (t.Status = 1 or t.Name = '" + user.userId + "')");
+                            + "' or t.Name = '" + user.userId + "'");
                     }
-                    else if (user.roleIds.Contains("a58a6f8f-0e50-4708-ae35-1fb85761a7b1"))
+                    else if (user.roleIds.Contains("d7d5bcd7-8f19-4904-be09-8941414bfb10"))//安全办
                     {
                         strSql.Append(" AND t.Status = '3' ");
                     }