【修改】学校管理-表单：省市区调整；提交保存获取表单数据调整；公告发布权限设置：部门查询下拉调整；学生用户：学生角色批量添加调整；教师信息管理：省市区调整；

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs

@@ -149,7 +149,7 @@ namespace Learun.Application.Organization
         {
             try
             {
-                return this.BaseRepository().FindEntity<RoleEntity>(t => t.F_FullName == v).F_RoleId;
+                return this.BaseRepository().FindEntity<RoleEntity>(t => t.F_FullName == v)?.F_RoleId;
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -98,11 +98,16 @@ var bootstrap = function ($, learun) {
                             value: 'CCODE',
                             text: 'CNAME'
                         });
-                        $('#RegionNo').lrselectRefresh({
+                    } else {
+                        $('#CityNo').lrselectRefresh({
                             url: "",
                             data: []
                         });
                     }
+                    $('#RegionNo').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
                 }
             });
             $('#CityNo').lrselect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml

@@ -58,12 +58,12 @@
     </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">学校地点</div>
-        <div id="area" class="col-xs-6 lr-form-area">
+        <div id="area" class="col-xs-12 lr-form-area">
             <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
             <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
             <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
         </div>
-        <div class="col-xs-6">
+        <div class="col-xs-12">
             <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
         </div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js

@@ -24,7 +24,44 @@ var bootstrap = function ($, learun) {
             // 上级公司
             $('#F_ParentId').lrCompanySelect();
             // 省市区
-            $('#area').lrAreaSelect();
+            $('#F_ProvinceId').lrDataSourceSelect({
+                code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
+                select: function (item) {
+                    if (item) {
+                        $('#F_CityId').lrselectRefresh({
+                            url: top.$.rootUrl + "/DIC_CITY/GetListByProvinceCode",
+                            param: { ProvinceCode: item.pcode },
+                            value: 'CCODE',
+                            text: 'CNAME'
+                        });
+                    } else {
+                        $('#F_CityId').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#F_CountyId').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#F_CityId').lrselect({
+                value: 'ccode', text: 'cname',
+                select: function (item) {
+                    if (item) {
+                        $('#F_CountyId').lrselectRefresh({
+                            url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode",
+                            param: { cityCode: item.CCODE },
+                            value: 'ACODE',
+                            text: 'ANAME'
+                        });
+                    }
+                }
+            });
+            $('#F_CountyId').lrselect({
+                value: 'ACODE', text: 'ANAME'
+            });
             $('#F_Photo').lrUploader();
             F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
             //$('#F_BriefIntroduction')[0].ue = F_BriefIntroductionUE;
@@ -57,7 +94,7 @@ var bootstrap = function ($, learun) {
         if (!$('#form').lrValidform()) {
             return false;
         }
-        var postData = $('#form').lrGetFormData(keyValue);
+        var postData = $('#form').lrGetFormData();
         if (postData["F_ParentId"] == '' || postData["F_ParentId"] == ' ') {
             postData["F_ParentId"] = '0';
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Index.js

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DepartmentID').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' });
+            $('#DepartmentID').lrDepartmentSelect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();