From 0373dc3c22979a7e784b6120af5fccc424750d3e Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 3 Feb 2023 16:41:53 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20Company=E6=AC=84=E4=BD=8D=E5=90=8D?=
 =?UTF-8?q?=E7=A8=B1=E8=AA=BF=E6=95=B4=20[WHY]=20=E9=96=8B=E7=99=BC=20Show?=
 =?UTF-8?q?Easy=20=E5=89=8D=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShowEasy/CompanyMaintain_QryService.cs    | 32 -------------------
 EuroTran/Entity/Sugar/SETB_CRM_Company.cs     | 13 ++++----
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/CompanyMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/CompanyMaintain_QryService.cs
index 4ce9d47..9d6e922 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/CompanyMaintain_QryService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/CompanyMaintain_QryService.cs
@@ -43,30 +43,12 @@ namespace EasyBL.WEBAPP.SYS
                         })
                         .ToList();
 
-                    RegionMaintain_QryService region_qry = new RegionMaintain_QryService();
                     CountryMaintain_QryService country_qry = new CountryMaintain_QryService();
-                    CityMaintain_QryService city_qry = new CityMaintain_QryService();
 
-                    var RegionMap = region_qry.FindAllByIDsAsDictionary(sLanguageID, "");
                     var CountryMap = country_qry.FindAllByIDsAsDictionary(sLanguageID, "", "");
-                    var CityMap = city_qry.FindAllByIDsAsDictionary(sLanguageID, "", "", "");
 
                     foreach (var Company in rsCompanyList) {
 
-                        if (!string.IsNullOrEmpty(Company.RegionID))
-                        {
-
-                            if (RegionMap.ContainsKey(Company.RegionID))
-                            {
-
-                                var Region = RegionMap[Company.RegionID];
-                                Company.Region.RegionID = Region.RegionID;
-                                Company.Region.RegionName = Region.RegionName;
-
-                            }
-
-                        }
-
                         if (!string.IsNullOrEmpty(Company.CountryID))
                         {
 
@@ -80,20 +62,6 @@ namespace EasyBL.WEBAPP.SYS
 
                         }
 
-                        if (!string.IsNullOrEmpty(Company.CityID))
-                        {
-
-                            if (CityMap.ContainsKey(Company.CityID))
-                            {
-
-                                var City = CityMap[Company.CityID];
-                                Company.City.CityID = City.CityID;
-                                Company.City.CityName = City.CityName;
-
-                            }
-
-                        }
-
                         rsResultList.Add(Company);
                     }
 
diff --git a/EuroTran/Entity/Sugar/SETB_CRM_Company.cs b/EuroTran/Entity/Sugar/SETB_CRM_Company.cs
index 1ff35d4..533d463 100644
--- a/EuroTran/Entity/Sugar/SETB_CRM_Company.cs
+++ b/EuroTran/Entity/Sugar/SETB_CRM_Company.cs
@@ -54,24 +54,25 @@ namespace Entity.Sugar
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string RegionID { get; set; }
-        public const string CN_REGIONID = "RegionID";
+        public string CountryID { get; set; }
+        public const string CN_COUNTRYID = "CountryID";
 
         /// <summary>
         /// Desc:
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string CountryID { get; set; }
-        public const string CN_COUNTRYID = "CountryID";
+        public string StateName { get; set; }
+        public const string CN_StateName = "StateName";
+
 
         /// <summary>
         /// Desc:
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string CityID { get; set; }
-        public const string CN_CITYID = "CityID";
+        public string CityName { get; set; }
+        public const string CN_CityName = "CityName";
 
         /// <summary>
         /// Desc: