From a3022b7241480fd71dae97443d98f12e313056be Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 26 十月 2022 17:22:30 +0800
Subject: [PATCH] 修复24-25日反馈的bug

---
 web/web/gwspupdate.aspx.cs |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/web/web/gwspupdate.aspx.cs b/web/web/gwspupdate.aspx.cs
index 85f7ffd..254d9e7 100644
--- a/web/web/gwspupdate.aspx.cs
+++ b/web/web/gwspupdate.aspx.cs
@@ -14,6 +14,9 @@
     protected List<GwOp> OpList;
     protected List<GwProduct> GwProductList;
 
+    private int _userId = -1;
+    private string _userType = "";
+    private string _account = "";
 
 
     public GwSp GwSp { get; protected set; }
@@ -38,6 +41,10 @@
 
     protected void Page_Load(object sender, EventArgs e)
     {
+        _userId = this.AppContext.SessionObject.UserID;
+        _userType = this.AppContext.SessionObject.UserType;
+        _account = this.AppContext.SessionObject.Account;
+
         using (GwApDao gwApDao = new GwApDao())
             this.ApList = gwApDao.LoadInfoList();
         using (GwOpDao gwOpDao = new GwOpDao())
@@ -72,6 +79,18 @@
                 this.GwSp.AccessCodeMode = 0;
                 this.GwSp.ExtnoExtensionMode = 0;
                 this.GwSp.CombinationMode = 0;
+
+                this.GwSp.SubPackageNum = 4000;
+                this.GwSp.SingleSubmitMinRestrict = 0;
+                this.GwSp.IsDispalyPrice = 0;
+                this.GwSp.DeductionMode = 1;
+                this.GwSp.IsSendAudit = 0;
+                this.GwSp.BelowNumAudit = 0;
+                this.GwSp.AboveNumAudit = 0;
+                this.GwSp.IsCumulativeAudit = 0;
+                this.GwSp.CumulativeAuditNum = 0;
+                this.GwSp.CumulativeAuditTime = 0;
+                this.GwSp.IsSyncChildSendAudit = 0;
             }
         }
 
@@ -80,6 +99,7 @@
         {
             GwProduct bean = new GwProduct();
             bean.Classes = 1;
+            bean.IsDefault = -1;
             bean.IsEnable = -1;
             this.GwProductList = gwProductDao.getAllList(bean);
         }
@@ -184,8 +204,9 @@
     {
         using (GwClientDao gwClientDao = new GwClientDao())
         {
+            string permissionsSQL = gwClientDao.GetClientPermissions(_userId, _userType, null);
             string str = "";
-            List<GwClient> list = gwClientDao.LoadInfoList("", "", "", "");
+            List<GwClient> list = gwClientDao.LoadInfoList("", "", "", "", permissionsSQL);
             if (list.Count == 0)
             {
                 str += string.Format("<option value=\"\">灏氭湭鍒涘缓瀹㈡埛淇℃伅</option>");
@@ -193,7 +214,7 @@
             else
             {
                 foreach (GwClient gwClient in list)
-                    str = !(clientId == gwClient.ClientID) ? str + string.Format("<option value=\"{0}\">{0}-{1}</option>", (object)gwClient.ClientID, (object)gwClient.ClientName) : str + string.Format("<option value=\"{0}\" selected>{0}-{1}</option>", (object)gwClient.ClientID, (object)gwClient.ClientName);
+                    str = !(clientId == gwClient.ClientID) ? str + string.Format("<option value=\"{0}\">{1}</option>", (object)gwClient.ClientID, (object)gwClient.ClientID) : str + string.Format("<option value=\"{0}\" selected>{1}</option>", (object)gwClient.ClientID, (object)gwClient.ClientID);
             }
             return str;
         }
@@ -229,10 +250,12 @@
     //鑾峰彇浜у搧淇℃伅
     public string GetProductOptions(string productId)
     {
+        if (productId==null)
+            return "<option value='0'>鏃�</option>";
         StringBuilder stringBuilder = new StringBuilder();
         if (this.GwProductList.Count == 0)
             return "<option value='0'>鏃�</option>";
-        stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)0, (object)"鏃�");
+        stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)"", (object)"鏃�");
         foreach (GwProduct bean in this.GwProductList)
         {
             //鍋滅敤鐨勪骇鍝佸垎绫讳笉鍐嶆樉绀�
@@ -247,9 +270,9 @@
             }
 
             if (productId.Equals(bean.Id))
-                stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+                stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.Id, (object)bean.Name);
             else
-                stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+                stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.Id, (object)bean.Name);
         }
         return stringBuilder.ToString();
     }

--
Gitblit v1.9.1