Merge branch 'TPE/Daniel' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into TPE/Daniel

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/geos_info_id.vue

@@ -380,8 +380,11 @@
 
         //const requestData = { showList: false, countryId: "CN", provinceId, cityId };
 
+        // 設定 hasMail 參數
+        let hasMail = notifyType.value == "mail";
+
         // 國際站  // 參數要填 CountryId : TW,"cityId": "01"
-        const requestData = { countryId: parentId, cityId, cityId };
+        const requestData = { countryId: parentId, cityId: cityId, hasMail: hasMail };
 
         //调用 fetchSchoolDataByCity 时，isLoading 置为 true
 

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/geos_info_id_cn.vue

@@ -353,8 +353,11 @@
 
         //const requestData = { showSchool: false, countryId: "CN", provinceId, cityId };
 
+        // 設定 hasMail 參數
+        let hasMail = notifyType.value == "mail";
+
         // 國際站  // 參數要填 CountryId : TW,"cityId": "01"
-        const requestData = { countryId: parentId, cityId, cityId };
+        const requestData = { countryId: parentId, cityId: cityId, hasMail: hasMail };
 
         //调用 fetchSchoolDataByCity 时，isLoading 置为 true
 

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/geos_info_school.vue

@@ -267,7 +267,7 @@
         // 設定 hasMail 參數
         let hasMail = notifyType.value == "mail";
 
-        const requestData = { showSchool: false, hasMail: hasMail };   // 其實不需要輸入參數
+        const requestData = { showSchool: false, hasMail: hasMail }; 
         //const requestData = { showSchool: false };   // 國際站，不需要輸入特定參數，就可以取得國碼
         //const requestData = { showSchool: false, countryId: "CN" };   // 大陸站，不需要輸入特定參數，就可以取得省分
 
@@ -382,11 +382,14 @@
 
         //const requestData = { showSchool: false, countryId: "CN", provinceId, cityId };
 
+        // 設定 hasMail 參數
+        let hasMail = notifyType.value == "mail";
+
         // 國際站  // 參數要填 CountryId : TW,"cityId": "01"
-        const requestData = { countryId: parentId, cityId, cityId };
+        const requestData = { countryId: parentId, cityId: cityId, hasMail: hasMail };
 
         //调用 fetchSchoolDataByCity 时，isLoading 置为 true
-
+        
         try {
 
             const response = await proxy.$api.getGeos(requestData);

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/geos_info_school_cn.vue

@@ -245,7 +245,7 @@
         // 設定 hasMail 參數
         let hasMail = notifyType.value == "mail";
 
-        const requestData = { showSchool: false, hasMail: hasMail };   // 其實不需要輸入參數
+        const requestData = { showSchool: false, hasMail: hasMail };  
         //const requestData = { showSchool: false };   // 國際站，不需要輸入特定參數，就可以取得國碼
         //const requestData = { showSchool: false, countryId: "CN" };   // 大陸站，不需要輸入特定參數，就可以取得省分
 
@@ -364,8 +364,11 @@
 
         //const requestData = { showSchool: false, countryId: "CN", provinceId, cityId };
 
+        // 設定 hasMail 參數
+        let hasMail = notifyType.value == "mail";
+
         // 國際站  // 參數要填 CountryId : TW,"cityId": "01"
-        const requestData = { countryId: parentId, cityId, cityId };
+        const requestData = { countryId: parentId, cityId: cityId, hasMail: hasMail };
 
         //调用 fetchSchoolDataByCity 时，isLoading 置为 true