gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://code.adminnet.top/Admin.NET/Admin.NET.Pro into v2

Browse Source
This commit is contained in:
zuohuaijun 2025-03-31 16:59:29 +08:00
commit 74ec7c8066
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -359,7 +359,8 @@ public class SysTenantService : IDynamicApiController, ITransient
await _sysOrgRep.UpdateAsync(u => new SysOrg() { Name = input.Name, Pid = input.OrgPid }, u => u.Id == input.OrgId); await _sysOrgRep.UpdateAsync(u => new SysOrg() { Name = input.Name, Pid = input.OrgPid }, u => u.Id == input.OrgId);
// 更新系统用户 // 更新系统用户
await _sysUserRep.UpdateAsync(u => new SysUser() { Account = input.AdminAccount, RealName = input.RealName, Phone = input.Phone, Email = input.Email }, u => u.Id == input.UserId); await _sysUserRep.UpdateAsync(u => new SysUser() { Account = input.AdminAccount, RealName = input.RealName, Phone = input.Phone, Email = input.Email },
u => u.Id == input.UserId);
await CacheTenant(input.Id); await CacheTenant(input.Id);
@ -627,6 +628,7 @@ public class SysTenantService : IDynamicApiController, ITransient
var tenant = await _sysTenantRep.GetFirstAsync(u => u.Id == input.TenantId); var tenant = await _sysTenantRep.GetFirstAsync(u => u.Id == input.TenantId);
_ = tenant ?? throw Oops.Oh(ErrorCodeEnum.D1002); _ = tenant ?? throw Oops.Oh(ErrorCodeEnum.D1002);
var originLogo = tenant.Logo;
tenant = input.Adapt<SysTenant>(); tenant = input.Adapt<SysTenant>();
tenant.Id = input.TenantId; tenant.Id = input.TenantId;
@ -665,7 +667,7 @@ public class SysTenantService : IDynamicApiController, ITransient
} }
else else
{ {
tenant.Logo = tenant.Logo; tenant.Logo = originLogo;
} }
await _sysTenantRep.AsUpdateable(tenant).UpdateColumns(u => new await _sysTenantRep.AsUpdateable(tenant).UpdateColumns(u => new

2
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm
View File

@ -87,7 +87,7 @@ public partial class @(@Model.ClassName)Mid
@: var key = $"@(@column.FkEntityName)_{t.@(@column.PropertyName)}"; @: var key = $"@(@column.FkEntityName)_{t.@(@column.PropertyName)}";
@: if (!sysCacheService.ExistKey(key)) @: if (!sysCacheService.ExistKey(key))
@: { @: {
@: var m = db.ForTenant<@(@column.FkEntityName)>().Queryable<@(@column.FkEntityName)>().FirstAsync(f => f.@(@column.FkLinkColumnName) == t.@(@column.PropertyName)); @: var m = db.ForTenant<@(@column.FkEntityName)>().Queryable<@(@column.FkEntityName)>().First(f => f.@(@column.FkLinkColumnName) == t.@(@column.PropertyName));
@: if (m != null) sysCacheService.Set(key, m); @: if (m != null) sysCacheService.Set(key, m);
@: } @: }
@: t.@(@column.PropertyName)@(@column.FkColumnName) = sysCacheService.Get<@(@column.FkEntityName)>(key)?.@(@column.FkColumnName); @: t.@(@column.PropertyName)@(@column.FkColumnName) = sysCacheService.Get<@(@column.FkEntityName)>(key)?.@(@column.FkColumnName);

2
Web/src/hooks/useVxeTableOptionsHook.ts
View File

@ -68,7 +68,7 @@ export const useVxeTable = <T>(opt: iVxeOption, extras?: VxeGridProps<T>) => {
pagerConfig: { pagerConfig: {
enabled: true, enabled: true,
size: vxeSize, size: vxeSize,
pageSize: 20, pageSize: 50,
}, },
printConfig: { sheetName: '' }, printConfig: { sheetName: '' },
// proxyConfig: { // proxyConfig: {

17
Web/src/views/system/user/component/userCenter.vue
View File

@ -322,14 +322,15 @@ const submitPassword = () => {
cpwd.passwordNew = sm2.doEncrypt(state.ruleFormPassword.passwordNew, publicKey, 1); cpwd.passwordNew = sm2.doEncrypt(state.ruleFormPassword.passwordNew, publicKey, 1);
await getAPI(SysUserApi).apiSysUserChangePwdPost(cpwd); await getAPI(SysUserApi).apiSysUserChangePwdPost(cpwd);
// 退出系统 // 修改密码后后端会强制下线，无需弹出确认重新登录提示
ElMessageBox.confirm(t('message.list.passwordModifiedConfirmRelogin'), t('message.list.hint'), { // // 退出系统
confirmButtonText: t('message.list.confirmButtonText'), // ElMessageBox.confirm(t('message.list.passwordModifiedConfirmRelogin'), t('message.list.hint'), {
cancelButtonText: t('message.list.cancelButtonText'), // confirmButtonText: t('message.list.confirmButtonText'),
type: 'warning', // cancelButtonText: t('message.list.cancelButtonText'),
}).then(async () => { // type: 'warning',
clearAccessTokens(); // }).then(async () => {
}); // clearAccessTokens();
// });
}); });
}; };