diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 670cbee1f..1bbaa170c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
@@ -125,7 +125,7 @@ var bootstrap = function ($, learun) {
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
             $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
-            $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
+            $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js
index e74f8a8f7..6b9a53383 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js	
@@ -8,7 +8,7 @@ var acceptClick;
 var keyValue = request('keyValue');
 var isTeacher = request('isTeacher');
 var colDataItemArr = ['GenderNo', 'IsInActiveStatus', 'EmpSortNo', 'PositionLevel', 'CompilationCategory', 'ObtainWayOfHighestRecord', 'ObtainWay', 'ObtainWayOfHighestDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson'];
-var colDataItemCode = ['BCdPartyFace', 'BCdDegree', 'BCdFamilyOrigin','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit'];
+var colDataItemCode = ['BCdPartyFace', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit'];
 var colDataSourceArr = ['PartyFaceNo', 'NationalityNo', 'HealthStatusNo', 'FamilyOriginNo', 'OverseasChineseNo', 'F_CompanyId', 'F_DepartmentId', 'DeptNo', 'PostRank', 'HighestRecord', 'CultureDegreeNo', 'DegreeNo', 'InitialDegree', 'SubjectSpeciesNo', 'ForeignLanguageNo'];
 var colDataSourceCode = ['BCdPartyFace', 'BCdNationality', 'BCdHealthStatus', 'BCdFamilyOrigin', 'BCdOverseasChinese', 'company', 'classdata', 'CdDeptInfo', 'BCdTitleOfTechPost', 'BCdCultureDegree', 'BCdCultureDegree',  'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage'];
 var colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'deptno', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno'];
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
index fb5191e21..67c9002e5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml	
@@ -231,13 +231,12 @@
                 },
                 foreignLanguageNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'foreignlanguageno',
+                        code: 'BCdForeignLanguage',
                         callback: function (_data) {
-                            result = _data.foreignlanguagename;
-                        }.bind(this)
+                            result = _data.text;
+                        }
                     });
                     return result;
                 },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js
index a1af557c6..8db72e3b5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js	
@@ -73,7 +73,7 @@ var bootstrap = function ($, learun) {
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' });
-            $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' });
+            $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage' });
             $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
index ac891e97b..40d97a188 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
@@ -572,13 +572,12 @@
                                     },
                                     foreignLanguageNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'foreignlanguageno',
+                                            code: 'BCdForeignLanguage',
                                             callback: function (_data) {
-                                                result = _data.foreignlanguagename;
-                                            }.bind(this)
+                                                result = _data.text;
+                                            }
                                         });
                                         return result;
                                     },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
index 22d7816ac..f005a02a3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml	
@@ -621,13 +621,12 @@
                                 },
                                 foreignLanguageNo: function (value) {
                                     var result;
-                                    top.learun.clientdata.getAsync('custmerData', {
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage',
+                                    top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        keyId: 'foreignlanguageno',
+                                        code: 'BCdForeignLanguage',
                                         callback: function (_data) {
-                                            result = _data.foreignlanguagename;
-                                        }.bind(this)
+                                            result = _data.text;
+                                        }
                                     });
                                     return result;
                                 },