From 4eaa0a6aef3d23c0d1567c96b636bdd8d8b378c7 Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Mon, 4 Mar 2024 14:26:04 +0800
Subject: [PATCH] 1

---
 .../MvcShipping/Controllers/MsBaseInfoController.cs    | 10 ++++++++++
 DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs    |  2 +-
 DSWeb/DSWeb.csproj.user                                |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsBaseInfoController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsBaseInfoController.cs
index 36d0d7d7..dec4bc49 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsBaseInfoController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsBaseInfoController.cs
@@ -522,6 +522,11 @@ namespace DSWeb.MvcShipping.Controllers
 
         public ContentResult SaveUserQuerySetting(string formname, string isvisible, string issavevalue, string querydetail)
         {
+            if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "")
+            {
+                var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时，请退出系统重新登录！" };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
+            }
 
             var result = new DBResult();
 
@@ -552,6 +557,11 @@ namespace DSWeb.MvcShipping.Controllers
         //高级查询设置
         public JsonResult GetQueryFieldSetting(string formname)
         {
+            if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "")
+            {
+                return Json (new { Success = false, Message = "登录超时，请退出系统重新登录！" });
+            }
+
             var evList = MsBaseInfoDAL.GetQueryFieldSetting(formname);
 
             return Json(new { success = true, data = evList });
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
index 0dced0bb..ff6a351d 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
@@ -1913,7 +1913,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             var SeaeOrderNorepeat = MsSysParamSetDAL.GetData("PARAMNAME='SeaeOrderNorepeat'");
             if (SeaeOrderNorepeat.PARAMVALUE == "1" && headData.ORDERNO != "" && headData.ORDERNO != null)
             {
-                var ct = MsOpSeaeDAL.GetRdCount("BSNO<>'" + headData.BSNO + "' AND ORDERNO='" + headData.ORDERNO + "' and CORPID='" + Convert.ToString(Session["COMPANYID"]) + "'");
+                var ct = MsOpSeaeDAL.GetRdCount("BSNO<>'" + headData.BSNO + "' AND ORDERNO='" + headData.ORDERNO + "' and CORPID='" + companyid + "'");
                 if (ct != 0)
                 {
                     isPost = false;
diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user
index 129b0bf8..a8615099 100644
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>E:\DS7_dev\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />