From a17b8d525a28b608ef067010d86c2bc34300a609 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 25 一月 2024 18:24:32 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 4 ++--
server/service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java | 2 +-
server/service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java | 2 +-
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 2 +-
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 5 ++---
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index d108c33..107521a 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -126,8 +126,7 @@
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
- queryUserDto.setType(Constants.ZERO);
-
+// queryUserDto.setType(Constants.ZERO);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
@@ -136,7 +135,7 @@
if (StringUtils.isNotBlank(systemUser.getMobile())) {
queryUserDto = new SystemUser();
queryUserDto.setDeleted(Boolean.FALSE);
- queryUserDto.setEmpNo(systemUser.getMobile());
+ queryUserDto.setMobile(systemUser.getMobile());
user = systemUserService.findOne(queryUserDto);
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪");
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 10bcf6d..968f073 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -105,8 +105,7 @@
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
- LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
- if(authenticationToken.getUserType() == 0){
+ if(authenticationToken.getUserType() == 0){
CompanyPermission c = new CompanyPermission();
c.setUserId(user.getId());
c.setIsdeleted(Constants.ZERO);
@@ -126,6 +125,7 @@
}
user.setCompany(company);
}
+ LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
// 楠岃瘉鐢ㄦ埛
return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
index 24f3a2e..1772481 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
@@ -65,7 +65,7 @@
@Override
public SystemTraceLog findOne(SystemTraceLog systemTraceLog) {
- Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog);
+ Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog).last("limit 1");;
return systemTraceLogMapper.selectOne(wrapper);
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
index f76fc51..e24389a 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
@@ -81,7 +81,7 @@
@Override
public SystemUserRole findOne(SystemUserRole systemUserRole) {
- Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole);
+ Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole).last("limit 1");
return systemUserRoleMapper.selectOne(wrapper);
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 1e0c554..01e6014 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -112,7 +112,7 @@
@Override
public SystemUser findOne(SystemUser systemUser) {
- Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
+ Wrapper<SystemUser> wrapper = new QueryWrapper<SystemUser>(systemUser).last("limit 1");
return systemUserMapper.selectOne(wrapper);
}
--
Gitblit v1.9.3