diff --git a/SGGL/BLL/JDGL/SGManPower/SGManPowerService.cs b/SGGL/BLL/JDGL/SGManPower/SGManPowerService.cs
index 481ac3ef..90b24a15 100644
--- a/SGGL/BLL/JDGL/SGManPower/SGManPowerService.cs
+++ b/SGGL/BLL/JDGL/SGManPower/SGManPowerService.cs
@@ -663,6 +663,10 @@ namespace BLL
 
                 string urlParams = "JDGL/SGManPower/SGWarningDetails.aspx?projectId=" + projectId;
                 // 添加单位参数
+                if (!string.IsNullOrEmpty(unitId))
+                {
+                    urlParams += "&unitId=" + unitId;
+                }
                 if (!string.IsNullOrEmpty(warningType))
                 {
                     urlParams += "&warningType=" + warningType;
@@ -739,6 +743,10 @@ namespace BLL
 
             string urlParams = "JDGL/SGManPower/SGWarningDetails.aspx?projectId=" + projectId;
             // 添加单位参数
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                urlParams += "&unitId=" + unitId;
+            }
             if (!string.IsNullOrEmpty(warningType))
             {
                 urlParams += "&warningType=" + warningType;
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工人力计划导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工人力计划导入模板.xls
index a021df98..16e558ac 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工人力计划导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工人力计划导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.cs b/SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.cs
index 6591e4e3..c12e5e04 100644
--- a/SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.cs
@@ -21,6 +21,12 @@ namespace FineUIPro.Web.JDGL.SGManPower
             set { ViewState["ProjectId"] = value; }
         }
 
+        public string UnitId
+        {
+            get => (string)ViewState["UnitId"];
+            set => ViewState["UnitId"] = value;
+        }
+        
         public string WarningType
         {
             get => (string)ViewState["WarningType"];
@@ -37,6 +43,7 @@ namespace FineUIPro.Web.JDGL.SGManPower
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 this.ProjectId = Request.Params["projectId"];
+                this.UnitId = Request.Params["unitId"];
                 this.WarningType = Request.Params["warningType"];
                 // 绑定表格
                 BindGrid();
@@ -56,7 +63,11 @@ namespace FineUIPro.Web.JDGL.SGManPower
                 strSql += " AND  ProjectId = @ProjectId ";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
-            
+            if (!string.IsNullOrEmpty(this.UnitId))
+            {
+                strSql += " AND  UnitId = @UnitId ";
+                listStr.Add(new SqlParameter("@UnitId", this.UnitId));
+            }
             if (!string.IsNullOrEmpty(this.WarningType))
             {
                 strSql += " AND  WarningType = @WarningType ";
@@ -76,6 +87,21 @@ namespace FineUIPro.Web.JDGL.SGManPower
         }
         
         
+        #region 查询事件
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnQuery_OnClick(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
+        #endregion
+        
+        
         /// <summary>
         /// 右键编辑事件
         /// </summary>