😁更新接口文件

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.32.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.106-preview21" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.106-preview25" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -64,7 +64,7 @@ public class SysUserService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
             .WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))
-            .Distinct().OrderBy(u => u.OrderNo)     //此处去一下重，避免用户有多个角色时，返回重复数据
+            .OrderBy(u => u.OrderNo)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 

Web/src/api-services/apis/sys-code-gen-config-api.ts

@@ -31,7 +31,9 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -59,7 +61,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -92,8 +94,16 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['ColumnName'] = columnName;
             }
 
-            if (lowerColumnName !== undefined) {
-                localVarQueryParameter['LowerColumnName'] = lowerColumnName;
+            if (propertyName !== undefined) {
+                localVarQueryParameter['PropertyName'] = propertyName;
+            }
+
+            if (columnLength !== undefined) {
+                localVarQueryParameter['ColumnLength'] = columnLength;
+            }
+
+            if (lowerPropertyName !== undefined) {
+                localVarQueryParameter['LowerPropertyName'] = lowerPropertyName;
             }
 
             if (columnComment !== undefined) {
@@ -214,7 +224,9 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -242,7 +254,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/list`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -275,8 +287,16 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['ColumnName'] = columnName;
             }
 
-            if (lowerColumnName !== undefined) {
-                localVarQueryParameter['LowerColumnName'] = lowerColumnName;
+            if (propertyName !== undefined) {
+                localVarQueryParameter['PropertyName'] = propertyName;
+            }
+
+            if (columnLength !== undefined) {
+                localVarQueryParameter['ColumnLength'] = columnLength;
+            }
+
+            if (lowerPropertyName !== undefined) {
+                localVarQueryParameter['LowerPropertyName'] = lowerPropertyName;
             }
 
             if (columnComment !== undefined) {
@@ -454,7 +474,9 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -482,8 +504,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -495,7 +517,9 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -523,8 +547,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -559,7 +583,9 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -587,8 +613,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -596,7 +622,9 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {number} [id] 主键Id
          * @param {number} [codeGenId] 代码生成主表ID
          * @param {string} [columnName] 数据库字段名
-         * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+         * @param {string} [propertyName] 实体属性名
+         * @param {number} [columnLength] 字段数据长度
+         * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [effectType] 作用类型（字典）
@@ -624,8 +652,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -653,7 +681,9 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {number} [id] 主键Id
      * @param {number} [codeGenId] 代码生成主表ID
      * @param {string} [columnName] 数据库字段名
-     * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+     * @param {string} [propertyName] 实体属性名
+     * @param {number} [columnLength] 字段数据长度
+     * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
      * @param {string} [columnComment] 字段描述
      * @param {string} [netType] .NET类型
      * @param {string} [effectType] 作用类型（字典）
@@ -682,8 +712,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -691,7 +721,9 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {number} [id] 主键Id
      * @param {number} [codeGenId] 代码生成主表ID
      * @param {string} [columnName] 数据库字段名
-     * @param {string} [lowerColumnName] 数据库字段名(首字母小写)
+     * @param {string} [propertyName] 实体属性名
+     * @param {number} [columnLength] 字段数据长度
+     * @param {string} [lowerPropertyName] 数据库字段名(首字母小写)
      * @param {string} [columnComment] 字段描述
      * @param {string} [netType] .NET类型
      * @param {string} [effectType] 作用类型（字典）
@@ -720,8 +752,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/apis/sys-org-api.ts

@@ -129,11 +129,11 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {number} id 主键Id
          * @param {string} [name] 名称
          * @param {string} [code] 编码
-         * @param {string} [orgType] 机构类型
+         * @param {string} [type] 机构类型
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysOrgListGet: async (id: number, name?: string, code?: string, orgType?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysOrgListGet: async (id: number, name?: string, code?: string, type?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
                 throw new RequiredError('id','Required parameter id was null or undefined when calling apiSysOrgListGet.');
@@ -166,8 +166,8 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
                 localVarQueryParameter['Code'] = code;
             }
 
-            if (orgType !== undefined) {
-                localVarQueryParameter['OrgType'] = orgType;
+            if (type !== undefined) {
+                localVarQueryParameter['Type'] = type;
             }
 
             if (id !== undefined) {
@@ -281,12 +281,12 @@ export const SysOrgApiFp = function(configuration?: Configuration) {
          * @param {number} id 主键Id
          * @param {string} [name] 名称
          * @param {string} [code] 编码
-         * @param {string} [orgType] 机构类型
+         * @param {string} [type] 机构类型
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysOrgListGet(id: number, name?: string, code?: string, orgType?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysOrg>>> {
-            const localVarAxiosArgs = await SysOrgApiAxiosParamCreator(configuration).apiSysOrgListGet(id, name, code, orgType, options);
+        async apiSysOrgListGet(id: number, name?: string, code?: string, type?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysOrg>>> {
+            const localVarAxiosArgs = await SysOrgApiAxiosParamCreator(configuration).apiSysOrgListGet(id, name, code, type, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -341,12 +341,12 @@ export const SysOrgApiFactory = function (configuration?: Configuration, basePat
          * @param {number} id 主键Id
          * @param {string} [name] 名称
          * @param {string} [code] 编码
-         * @param {string} [orgType] 机构类型
+         * @param {string} [type] 机构类型
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysOrgListGet(id: number, name?: string, code?: string, orgType?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysOrg>> {
-            return SysOrgApiFp(configuration).apiSysOrgListGet(id, name, code, orgType, options).then((request) => request(axios, basePath));
+        async apiSysOrgListGet(id: number, name?: string, code?: string, type?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysOrg>> {
+            return SysOrgApiFp(configuration).apiSysOrgListGet(id, name, code, type, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -396,13 +396,13 @@ export class SysOrgApi extends BaseAPI {
      * @param {number} id 主键Id
      * @param {string} [name] 名称
      * @param {string} [code] 编码
-     * @param {string} [orgType] 机构类型
+     * @param {string} [type] 机构类型
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysOrgApi
      */
-    public async apiSysOrgListGet(id: number, name?: string, code?: string, orgType?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysOrg>> {
-        return SysOrgApiFp(this.configuration).apiSysOrgListGet(id, name, code, orgType, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysOrgListGet(id: number, name?: string, code?: string, type?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysOrg>> {
+        return SysOrgApiFp(this.configuration).apiSysOrgListGet(id, name, code, type, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/models/account-type-enum.ts

@@ -12,14 +12,14 @@
  * Do not edit the class manually.
  */
 /**
- * 账号类型枚举<br />&nbsp;其他 None = 0<br />&nbsp;普通账号 User = 1<br />&nbsp;系统管理员 Admin = 4<br />&nbsp;超级管理员 SuperAdmin = 999<br />
+ * 账号类型枚举<br />&nbsp;会员 Member = 666<br />&nbsp;普通账号 NormalUser = 777<br />&nbsp;系统管理员 SysAdmin = 888<br />&nbsp;超级管理员 SuperAdmin = 999<br />
  * @export
  * @enum {string}
  */
 export enum AccountTypeEnum {
-    NUMBER_0 = 0,
-    NUMBER_1 = 1,
-    NUMBER_4 = 4,
+    NUMBER_666 = 666,
+    NUMBER_777 = 777,
+    NUMBER_888 = 888,
     NUMBER_999 = 999
 }
 

Web/src/api-services/models/add-org-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -80,35 +81,53 @@ export interface AddOrgInput {
      */
     level?: number | null;
     /**
-     * 机构类型
+     * 机构类型-数据字典
      * @type {string}
      * @memberof AddOrgInput
      */
-    orgType?: string | null;
+    type?: string | null;
     /**
-     * 排序
+     * 负责人Id
      * @type {number}
      * @memberof AddOrgInput
      */
-    orderNo?: number;
+    directorId?: number;
     /**
-     * 备注
-     * @type {string}
+     * 
+     * @type {SysUser}
      * @memberof AddOrgInput
      */
-    remark?: string | null;
+    director?: SysUser;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof AddOrgInput
+     */
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}
      * @memberof AddOrgInput
      */
     status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof AddOrgInput
+     */
+    remark?: string | null;
     /**
      * 机构子项
      * @type {Array<SysOrg>}
      * @memberof AddOrgInput
      */
     children?: Array<SysOrg> | null;
+    /**
+     * 是否禁止选中
+     * @type {boolean}
+     * @memberof AddOrgInput
+     */
+    disabled?: boolean;
     /**
      * 名称
      * @type {string}

Web/src/api-services/models/add-user-input.ts

@@ -18,6 +18,7 @@ import { GenderEnum } from './gender-enum';
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
 import { SysPos } from './sys-pos';
+import { SysUser } from './sys-user';
 import { SysUserExtOrg } from './sys-user-ext-org';
 /**
  * 
@@ -206,7 +207,7 @@ export interface AddUserInput {
      */
     accountType?: AccountTypeEnum;
     /**
-     * 机构Id
+     * 直属机构Id
      * @type {number}
      * @memberof AddUserInput
      */
@@ -217,6 +218,18 @@ export interface AddUserInput {
      * @memberof AddUserInput
      */
     sysOrg?: SysOrg;
+    /**
+     * 直属主管Id
+     * @type {number}
+     * @memberof AddUserInput
+     */
+    managerUserId?: number;
+    /**
+     * 
+     * @type {SysUser}
+     * @memberof AddUserInput
+     */
+    managerUser?: SysUser;
     /**
      * 职位Id
      * @type {number}

Web/src/api-services/models/code-gen-config.ts

@@ -35,12 +35,24 @@ export interface CodeGenConfig {
      * @memberof CodeGenConfig
      */
     columnName?: string | null;
+    /**
+     * 实体属性名
+     * @type {string}
+     * @memberof CodeGenConfig
+     */
+    propertyName?: string | null;
+    /**
+     * 字段数据长度
+     * @type {number}
+     * @memberof CodeGenConfig
+     */
+    columnLength?: number;
     /**
      * 数据库字段名(首字母小写)
      * @type {string}
      * @memberof CodeGenConfig
      */
-    lowerColumnName?: string | null;
+    lowerPropertyName?: string | null;
     /**
      * 字段描述
      * @type {string}

Web/src/api-services/models/column-ouput.ts

@@ -23,12 +23,36 @@ export interface ColumnOuput {
      * @memberof ColumnOuput
      */
     columnName?: string | null;
+    /**
+     * 实体的Property名
+     * @type {string}
+     * @memberof ColumnOuput
+     */
+    propertyName?: string | null;
+    /**
+     * 字段数据长度
+     * @type {number}
+     * @memberof ColumnOuput
+     */
+    columnLength?: number;
     /**
      * 数据库中类型
      * @type {string}
      * @memberof ColumnOuput
      */
     dataType?: string | null;
+    /**
+     * 是否为主键
+     * @type {boolean}
+     * @memberof ColumnOuput
+     */
+    isPrimarykey?: boolean;
+    /**
+     * 是否允许为空
+     * @type {boolean}
+     * @memberof ColumnOuput
+     */
+    isNullable?: boolean;
     /**
      * .NET字段类型
      * @type {string}

Web/src/api-services/models/sys-code-gen-config.ts

@@ -65,6 +65,18 @@ export interface SysCodeGenConfig {
      * @memberof SysCodeGenConfig
      */
     columnName: string;
+    /**
+     * 实体属性名
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    propertyName: string;
+    /**
+     * 字段数据长度
+     * @type {number}
+     * @memberof SysCodeGenConfig
+     */
+    columnLength?: number;
     /**
      * 字段描述
      * @type {string}

Web/src/api-services/models/sys-org.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
+import { SysUser } from './sys-user';
 /**
  * 系统机构表
  * @export
@@ -86,33 +87,51 @@ export interface SysOrg {
      */
     level?: number | null;
     /**
-     * 机构类型
+     * 机构类型-数据字典
      * @type {string}
      * @memberof SysOrg
      */
-    orgType?: string | null;
+    type?: string | null;
     /**
-     * 排序
+     * 负责人Id
      * @type {number}
      * @memberof SysOrg
      */
-    orderNo?: number;
+    directorId?: number;
     /**
-     * 备注
-     * @type {string}
+     * 
+     * @type {SysUser}
      * @memberof SysOrg
      */
-    remark?: string | null;
+    director?: SysUser;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof SysOrg
+     */
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}
      * @memberof SysOrg
      */
     status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof SysOrg
+     */
+    remark?: string | null;
     /**
      * 机构子项
      * @type {Array<SysOrg>}
      * @memberof SysOrg
      */
     children?: Array<SysOrg> | null;
+    /**
+     * 是否禁止选中
+     * @type {boolean}
+     * @memberof SysOrg
+     */
+    disabled?: boolean;
 }

Web/src/api-services/models/sys-region.ts

@@ -24,18 +24,18 @@ export interface SysRegion {
      * @memberof SysRegion
      */
     id?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysRegion
-     */
-    name: string;
     /**
      * 父Id
      * @type {number}
      * @memberof SysRegion
      */
     pid?: number;
+    /**
+     * 名称
+     * @type {string}
+     * @memberof SysRegion
+     */
+    name: string;
     /**
      * 简称
      * @type {string}

Web/src/api-services/models/sys-user-ext-org.ts

@@ -13,6 +13,7 @@
  */
 import { SysOrg } from './sys-org';
 import { SysPos } from './sys-pos';
+import { SysUser } from './sys-user';
 /**
  * 系统用户扩展机构表
  * @export
@@ -31,6 +32,12 @@ export interface SysUserExtOrg {
      * @memberof SysUserExtOrg
      */
     userId?: number;
+    /**
+     * 
+     * @type {SysUser}
+     * @memberof SysUserExtOrg
+     */
+    sysUser?: SysUser;
     /**
      * 机构Id
      * @type {number}

Web/src/api-services/models/sys-user.ts

@@ -18,6 +18,7 @@ import { GenderEnum } from './gender-enum';
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
 import { SysPos } from './sys-pos';
+import { SysUser } from './sys-user';
 /**
  * 系统用户表
  * @export
@@ -217,7 +218,7 @@ export interface SysUser {
      */
     accountType?: AccountTypeEnum;
     /**
-     * 机构Id
+     * 直属机构Id
      * @type {number}
      * @memberof SysUser
      */
@@ -228,6 +229,18 @@ export interface SysUser {
      * @memberof SysUser
      */
     sysOrg?: SysOrg;
+    /**
+     * 直属主管Id
+     * @type {number}
+     * @memberof SysUser
+     */
+    managerUserId?: number;
+    /**
+     * 
+     * @type {SysUser}
+     * @memberof SysUser
+     */
+    managerUser?: SysUser;
     /**
      * 职位Id
      * @type {number}

Web/src/api-services/models/update-org-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -80,35 +81,53 @@ export interface UpdateOrgInput {
      */
     level?: number | null;
     /**
-     * 机构类型
+     * 机构类型-数据字典
      * @type {string}
      * @memberof UpdateOrgInput
      */
-    orgType?: string | null;
+    type?: string | null;
     /**
-     * 排序
+     * 负责人Id
      * @type {number}
      * @memberof UpdateOrgInput
      */
-    orderNo?: number;
+    directorId?: number;
     /**
-     * 备注
-     * @type {string}
+     * 
+     * @type {SysUser}
      * @memberof UpdateOrgInput
      */
-    remark?: string | null;
+    director?: SysUser;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof UpdateOrgInput
+     */
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}
      * @memberof UpdateOrgInput
      */
     status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof UpdateOrgInput
+     */
+    remark?: string | null;
     /**
      * 机构子项
      * @type {Array<SysOrg>}
      * @memberof UpdateOrgInput
      */
     children?: Array<SysOrg> | null;
+    /**
+     * 是否禁止选中
+     * @type {boolean}
+     * @memberof UpdateOrgInput
+     */
+    disabled?: boolean;
     /**
      * 名称
      * @type {string}

Web/src/api-services/models/update-user-input.ts

@@ -18,6 +18,7 @@ import { GenderEnum } from './gender-enum';
 import { StatusEnum } from './status-enum';
 import { SysOrg } from './sys-org';
 import { SysPos } from './sys-pos';
+import { SysUser } from './sys-user';
 import { SysUserExtOrg } from './sys-user-ext-org';
 /**
  * 
@@ -206,7 +207,7 @@ export interface UpdateUserInput {
      */
     accountType?: AccountTypeEnum;
     /**
-     * 机构Id
+     * 直属机构Id
      * @type {number}
      * @memberof UpdateUserInput
      */
@@ -217,6 +218,18 @@ export interface UpdateUserInput {
      * @memberof UpdateUserInput
      */
     sysOrg?: SysOrg;
+    /**
+     * 直属主管Id
+     * @type {number}
+     * @memberof UpdateUserInput
+     */
+    managerUserId?: number;
+    /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateUserInput
+     */
+    managerUser?: SysUser;
     /**
      * 职位Id
      * @type {number}

Web/src/views/system/org/component/editOrg.vue

@@ -43,7 +43,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="机构类型">
-							<el-select v-model="state.ruleForm.orgType" filterable clearable class="w100">
+							<el-select v-model="state.ruleForm.type" filterable clearable class="w100">
 								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
 						</el-form-item>

Web/src/views/system/org/index.vue

@@ -15,7 +15,7 @@
 							<el-input v-model="state.queryParams.code" placeholder="机构编码" clearable />
 						</el-form-item>
 						<el-form-item label="机构类型">
-							<el-select v-model="state.queryParams.orgType" filterable clearable class="w100">
+							<el-select v-model="state.queryParams.type" filterable clearable class="w100">
 								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
 						</el-form-item>
@@ -36,7 +36,7 @@
 						<el-table-column prop="name" label="机构名称" header-align="center" show-overflow-tooltip />
 						<el-table-column prop="code" label="机构编码" align="center" show-overflow-tooltip />
 						<el-table-column prop="level" label="级别" width="70" align="center" show-overflow-tooltip />
-						<el-table-column prop="orgType" label="机构类型" align="center" :formatter="dictFormatter" show-overflow-tooltip />
+						<el-table-column prop="type" label="机构类型" align="center" :formatter="dictFormatter" show-overflow-tooltip />
 						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 						<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 							<template #default="scope">
@@ -81,7 +81,7 @@ const state = reactive({
 		id: 0,
 		name: undefined,
 		code: undefined,
-		orgType: undefined,
+		type: undefined,
 	},
 	editOrgTitle: '',
 	orgTypeList: [] as any,
@@ -97,7 +97,7 @@ onMounted(async () => {
 // 查询操作
 const handleQuery = async (updateTree: boolean = false) => {
 	state.loading = true;
-	var res = await getAPI(SysOrgApi).apiSysOrgListGet(state.queryParams.id, state.queryParams.name, state.queryParams.code, state.queryParams.orgType);
+	var res = await getAPI(SysOrgApi).apiSysOrgListGet(state.queryParams.id, state.queryParams.name, state.queryParams.code, state.queryParams.type);
 	state.orgData = res.data.result ?? [];
 	state.loading = false;
 	// 是否更新左侧机构列表树
@@ -106,7 +106,7 @@ const handleQuery = async (updateTree: boolean = false) => {
 	}
 
 	// 若无选择节点并且查询条件为空时，更新编辑页面机构列表树
-	if (state.queryParams.id == 0 && state.queryParams.name == undefined && state.queryParams.code == undefined && state.queryParams.orgType == undefined) state.orgTreeData = state.orgData;
+	if (state.queryParams.id == 0 && state.queryParams.name == undefined && state.queryParams.code == undefined && state.queryParams.type == undefined) state.orgTreeData = state.orgData;
 };
 
 // 重置操作
@@ -114,7 +114,7 @@ const resetQuery = () => {
 	state.queryParams.id = 0;
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	state.queryParams.orgType = undefined;
+	state.queryParams.type = undefined;
 	handleQuery();
 };
 
@@ -150,7 +150,7 @@ const nodeClick = async (node: any) => {
 	state.queryParams.id = node.id;
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	state.queryParams.orgType = undefined;
+	state.queryParams.type = undefined;
 	handleQuery();
 };