😁调整机构列表查询权限及其他优化

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -51,7 +51,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=1310000000138, Pid=1310000000131, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
             new SysMenu{ Id=1310000000141, Pid=1310000000101, Title="机构管理", Path="/system/org", Name="sysOrg", Component="/system/org/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
-            new SysMenu{ Id=1310000000142, Pid=1310000000141, Title="查询", Permission="sysOrg:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            //new SysMenu{ Id=1310000000142, Pid=1310000000141, Title="查询", Permission="sysOrg:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000143, Pid=1310000000141, Title="编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000144, Pid=1310000000141, Title="增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000145, Pid=1310000000141, Title="删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

Admin.NET/Admin.NET.Core/Util/AdminResultProvider.cs

@@ -23,7 +23,7 @@ public class AdminResultProvider : IUnifyResultProvider
     /// <returns></returns>
     public IActionResult OnException(ExceptionContext context, ExceptionMetadata metadata)
     {
-        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors));
+        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors), UnifyContext.GetSerializerSettings(context));
     }
 
     /// <summary>
@@ -34,7 +34,7 @@ public class AdminResultProvider : IUnifyResultProvider
     /// <returns></returns>
     public IActionResult OnSucceeded(ActionExecutedContext context, object data)
     {
-        return new JsonResult(RESTfulResult(StatusCodes.Status200OK, true, data));
+        return new JsonResult(RESTfulResult(StatusCodes.Status200OK, true, data), UnifyContext.GetSerializerSettings(context));
     }
 
     /// <summary>
@@ -45,7 +45,7 @@ public class AdminResultProvider : IUnifyResultProvider
     /// <returns></returns>
     public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
     {
-        return new JsonResult(RESTfulResult(metadata.StatusCode ?? StatusCodes.Status400BadRequest, data: metadata.Data, errors: metadata.ValidationResult));
+        return new JsonResult(RESTfulResult(metadata.StatusCode ?? StatusCodes.Status400BadRequest, data: metadata.Data, errors: metadata.ValidationResult), UnifyContext.GetSerializerSettings(context));
     }
 
     /// <summary>

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

@@ -21,7 +21,7 @@
 						</el-form-item>
 						<el-form-item>
 							<el-button-group>
-								<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOrg:list'"> 查询 </el-button>
+								<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
 								<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 							</el-button-group>
 						</el-form-item>

Web/src/views/system/user/component/userCenter.vue

@@ -53,7 +53,7 @@
 			<el-col :span="16" :xs="24" v-loading="state.loading">
 				<el-card shadow="hover">
 					<el-tabs>
-						<el-tab-pane label="基础信息" v-if="auth('sysUser:baseInfo')">
+						<el-tab-pane label="基础信息">
 							<el-form :model="state.ruleFormBase" ref="ruleFormBaseRef" label-width="auto">
 								<el-row :gutter="35">
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -107,7 +107,7 @@
 								</el-row>
 							</el-form>
 						</el-tab-pane>
-						<el-tab-pane label="组织机构" v-if="auth('sysOrg:list')">
+						<el-tab-pane label="组织机构">
 							<OrgTree ref="orgTreeRef" />
 						</el-tab-pane>
 						<el-tab-pane label="修改密码">
@@ -174,9 +174,6 @@ import { clearAccessTokens, getAPI } from '/@/utils/axios-utils';
 import { SysFileApi, SysUserApi } from '/@/api-services/api';
 import { ChangePwdInput, SysUser } from '/@/api-services/models';
 
-import { auth, auths, authAll } from '/@/utils/authFunction';
-import { ElMessage } from 'element-plus';
-
 const stores = useUserInfo();
 const { userInfos } = storeToRefs(stores);
 const uploadSignRef = ref<UploadInstance>();
@@ -204,12 +201,10 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	if (auth('sysUser:baseInfo')) {
-		state.loading = true;
-		var res = await getAPI(SysUserApi).apiSysUserBaseInfoGet();
-		state.ruleFormBase = res.data.result ?? { account: '' };
-		state.loading = false;
-	}
+	state.loading = true;
+	var res = await getAPI(SysUserApi).apiSysUserBaseInfoGet();
+	state.ruleFormBase = res.data.result ?? { account: '' };
+	state.loading = false;
 });
 
 watch(state.signOptions, () => {
@@ -309,11 +304,8 @@ const submitPassword = () => {
 
 // 打开裁剪弹窗
 const openCropperDialog = () => {
-	if (!auth('sysFile:uploadAvatar')) ElMessage.error('抱歉，您没有权限！');
-	else {
-		state.cropperTitle = '更换头像';
-		cropperDialogRef.value?.openDialog(userInfos.value.avatar);
-	}
+	state.cropperTitle = '更换头像';
+	cropperDialogRef.value?.openDialog(userInfos.value.avatar);
 };
 
 // 鼠标进入和离开头像时