From 2ba9aa584b8a7d889e76f624c30599ae7ec01a36 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 13 Oct 2023 10:11:58 +0800
Subject: [PATCH] 2023-10-13

---
 .../Solution/EditConstructSolution.aspx.cs    | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
index 85cb3dd2..d2988bd9 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
@@ -1110,33 +1110,44 @@ namespace FineUIPro.Web.CQMS.Solution
             }
             string id = HFConstructSolutionId.Text;
             Model.Solution_CQMSConstructSolution constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(id);
-            if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
+            if (constructSolution != null)
             {
-                Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
-                if (approve != null || CurrUser.UserId == Const.sysglyId)
+                if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
+                {
+                    Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
+                    if (approve != null || CurrUser.UserId == Const.sysglyId)
+                    {
+                        PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                            String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
+                                ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId)));
+                    }
+                    else
+                    {
+                        if (!constructSolution.CompileMan.Equals(CurrUser.UserId))
+                        {
+                            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                                String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}&&editorMode={3}",
+                                    ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId, "view")));
+                        }
+
+                    }
+                }
+                else
                 {
                     PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
                         String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
                             ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId)));
                 }
-                else
-                {
-                    if (!constructSolution.CompileMan.Equals(CurrUser.UserId))
-                    {
-                        PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
-                            String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}&&editorMode={3}",
-                                ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId,"view")));
-                    } 
-
-                }
             }
             else
             {
                 PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
                     String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
                         ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId)));
+
             }
             
+            
         }
 
         protected void btnapprove_Click(object sender, EventArgs e)