|
|
@@ -48,8 +48,8 @@ public class CurrentUserUtil { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public static User getUserInfo() { |
|
|
|
// String username = SecurityUserUtils.username(); |
|
|
|
String username = "admin"; |
|
|
|
String username = SecurityUserUtils.username(); |
|
|
|
// String username = "admin"; |
|
|
|
User user = currentUserUtil.userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getMark, 1).eq(User::getStatus, 1).eq(User::getUsername, username)); |
|
|
|
if (null == user) { |
|
|
|
Tenant tenant = currentUserUtil.tenantMapper.selectOne(Wrappers.<Tenant>lambdaQuery().eq(Tenant::getMark, 1).eq(Tenant::getStatus, 1).eq(Tenant::getUsername, username)); |