diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
index 9aad070a..01cffd91 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
@@ -150,8 +150,8 @@
 
                                 <f:RenderField HeaderText="问题描述<font color='red'>(*)</font>" ColumnID="QuestionDef" DataField="QuestionDef"
                                     HeaderTextAlign="Center" TextAlign="Center" Width="150px" FieldType="String" >
-                                    <Editor>
-                                        <f:TextArea runat="server" AutoGrowHeight="true" AutoGrowHeightMin="60" AutoGrowHeightMax="300" ID="txtQuestion_Def" Text='<%# Bind("QuestionDef") %>'>
+                                    <Editor >
+                                        <f:TextArea   runat="server" AutoGrowHeight="true" AutoGrowHeightMin="60" AutoGrowHeightMax="300" ID="txtQuestion_Def" Text='<%# Bind("QuestionDef") %>'>
                                         </f:TextArea>
                                     </Editor>
                                 </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs
index ef832e62..53b834c3 100644
--- a/SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs
+++ b/SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs
@@ -280,6 +280,8 @@ namespace FineUIPro.Web.Controls
                     BLL.UserService.InitUserProjectIdRoleIdDropDownList(this.drpPerson, this.geProjectId, nextMenuFlowOperate.RoleId, true);     
                     this.drpPerson.Hidden = false;
 
+                } else if (this.txtAuditFlowName.Text == "编制单据"){
+                    this.drpPerson.Hidden = false;
                 }
                 else
                 {
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
index 3a340cfb..409caee2 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
@@ -90,7 +90,7 @@
                         TextAlign="Left">
                     </f:RenderField>
                     <f:WindowField TextAlign="Center" Width="90px" WindowID="WindowAtt" HeaderText="证书扫描件"
-                        Text="查看" ToolTip="附件上传查看" DataIFrameUrlFields="SafePersonQualityId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId=750F5074-45B9-470E-AE1E-6204957421E6&type=-1"
+                        Text="查看" ToolTip="附件上传查看" DataIFrameUrlFields="SafePersonQualityId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId=750F5074-45B9-470E-AE1E-6204957421E6&type=-1"
                         HeaderTextAlign="Center" ColumnID="attWindow" />
                 </Columns>
                 <Listeners>
diff --git a/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJh.aspx.cs b/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJh.aspx.cs
index 80a60981..f735d8d8 100644
--- a/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJh.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJh.aspx.cs
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.JDGL.JDJH
                                      U.UserName AS UploadManName
                                 FROM dbo.Common_FileManager AS t
                                 LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
-                                WHERE ToMenu='15' ";
+                                WHERE ToMenu='15' and t.ProjectId = '"+this.CurrUser.LoginProjectId+"' ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(txtFileName.Text))
diff --git a/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJhEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJhEdit.aspx.cs
index 58170bc1..52f86a51 100644
--- a/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJhEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/JDJH/EPCJhEdit.aspx.cs
@@ -49,6 +49,7 @@ namespace FineUIPro.Web.JDGL.JDJH
         {
             string fileId = Request.Params["fileId"];
             Model.Common_FileManager temp = new Model.Common_FileManager();
+            temp.ProjectId = this.CurrUser.LoginProjectId;
             if (txtFileName.Text == string.Empty)
             {
                 ShowNotify("名称不能为空!", MessageBoxIcon.Warning);
diff --git a/SGGL/FineUIPro.Web/JDGL/SGBG/Sgyb.aspx.cs b/SGGL/FineUIPro.Web/JDGL/SGBG/Sgyb.aspx.cs
index 4f3a3e8b..85e45bfe 100644
--- a/SGGL/FineUIPro.Web/JDGL/SGBG/Sgyb.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/SGBG/Sgyb.aspx.cs
@@ -31,7 +31,7 @@ namespace FineUIPro.Web.JDGL.SGBG
                                      U.UserName AS UploadManName
                                 FROM dbo.Common_FileManager AS t
                                 LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
-                                WHERE ToMenu='18' ";
+                                WHERE ToMenu='18' and t.ProjectId = '"+this.CurrUser.LoginProjectId+"' ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(txtFileName.Text))
diff --git a/SGGL/FineUIPro.Web/JDGL/SGBG/SgybEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/SGBG/SgybEdit.aspx.cs
index c65cbe45..89296bba 100644
--- a/SGGL/FineUIPro.Web/JDGL/SGBG/SgybEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/SGBG/SgybEdit.aspx.cs
@@ -49,6 +49,7 @@ namespace FineUIPro.Web.JDGL.SGBG
         {
             string fileId = Request.Params["fileId"];
             Model.Common_FileManager temp = new Model.Common_FileManager();
+            temp.ProjectId = this.CurrUser.LoginProjectId;
             if (txtFileName.Text == string.Empty)
             {
                 ShowNotify("名称不能为空!", MessageBoxIcon.Warning);
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index cbcd3620..a0ae471a 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -6,7 +6,7 @@
 <TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode>
 <TreeNode id="098307DA-C53D-4EDB-8587-339CD782031F" Text="质量管理规定/程序文件" NavigateUrl="CQMS/ZLCH/Zlglgd.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工组织设计/施工方案" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工组织设计及施工方案" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
+<TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工组织设计/施工方案" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工组织设计及施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
 <TreeNode id="fd116c94-714b-4b92-a3c9-cc83d358e2b3" Text="超过一定规模危大施工方案" NavigateUrl="CQMS/Comprehensive/MajorPlanApproval.aspx"></TreeNode>
 <TreeNode id="B068DA9C-FDB8-42CF-82FB-377F63840431" Text="施工方案定稿文件" NavigateUrl="CQMS/Solution/ConstructSolutionFinal.aspx"></TreeNode>
 <TreeNode id="D5F6DFAA-4051-4E0E-818B-2A45F985C5A4" Text="HSE方案模板" NavigateUrl="HSSE/Solution/SolutionTemplate.aspx"></TreeNode>