From 008a174c9f333166e8a2c5d9363c91c619def610 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期三, 12 七月 2023 20:44:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java index c66d5f2..ffedce2 100644 --- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java @@ -78,13 +78,16 @@ //鎷垮埌閰嶇疆鐨勮秴绠d @Value("${user-info.id}") private String adminUserId; - + @Value("${user-info.tenant-id}") + private String tenantId; @Override @Transactional(rollbackFor = Exception.class) public boolean submit(User user) { if (StringUtil.isBlank(user.getTenantId())) { - user.setTenantId(BladeConstant.ADMIN_TENANT_ID); + // user.setTenantId(BladeConstant.ADMIN_TENANT_ID); + // 榛樿璁剧疆涓虹鐞嗙粍涓嬬殑鐢ㄦ埛 + user.setTenantId(this.tenantId); } String tenantId = user.getTenantId(); //Tenant tenant = SysCache.getTenant(tenantId); -- Gitblit v1.9.3