Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -1286,7 +1286,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetStatisticProvince(string queryJson)
         {
             var data = stuInfoFreshIBLL.GetList2(queryJson);
-            var list = data.Where(x => !string.IsNullOrEmpty(x.Province) && !string.IsNullOrEmpty(x.City)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel
+            var list = data.Where(x => !string.IsNullOrEmpty(x.Province)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel
             {
                 Province = x.Key.Province,
                 City = x.Key.City,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js

@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticProvince',
                 headData: [
                     {
-                        label: '生源地', name: 'Province', width: 100, align: "left",
+                        label: '省份', name: 'Province', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '疆内', name: 'City', width: 100, align: "left",
+                        label: '地市', name: 'City', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -206,6 +206,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     {
                         item.IsStudentEdit = false;
                     }
+
+                    if (item.Province != "650000")
+                    {
+                        item.City = "";
+                    }
                 }
 
                 return data;