chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenxudong:520d1885f7ac6ccf73978b141c8dc601a9aaf6ce
Branches Tags
chenxudong:master
chenxudong:test
chenxudong:develop
chenxudong:develop_comac
..
compare: chenxudong:8eae6e860bcf79c02b1fa447974b1b4235e0bb34
Branches Tags
chenxudong:test
chenxudong:develop
chenxudong:develop_comac
chenxudong:master

No commits in common. "520d1885f7ac6ccf73978b141c8dc601a9aaf6ce" and "8eae6e860bcf79c02b1fa447974b1b4235e0bb34" have entirely different histories.
520d1885f7 ... 8eae6e860b

2 changed files with 0 additions and 11 deletions
Show Stats Expand all files Collapse all files

6
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.use
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.UserRepository; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.UserRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService; import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
import electromagnetic.data.framework.share.constants.UserConstants;
import electromagnetic.data.framework.share.exception.LoggerConstant; import electromagnetic.data.framework.share.exception.LoggerConstant;
import electromagnetic.data.framework.share.util.SignUtils; import electromagnetic.data.framework.share.util.SignUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -113,11 +112,6 @@ public class UserServiceImpl implements UserService {
*/ */
@Override @Override
public Boolean deleteUser(UserDeleteKeyWords userDeleteKeyWords) { public Boolean deleteUser(UserDeleteKeyWords userDeleteKeyWords) {
String workNumber = userRepository.getSingleUser(userDeleteKeyWords.getUserId()).getWorkNumber();
if (UserConstants.ADMIN_WORK_NUMBER.equals(workNumber)) {
throw new RuntimeException("管理员用户无法删除");
}
return userRepository.deleteUser(userDeleteKeyWords)>0; return userRepository.deleteUser(userDeleteKeyWords)>0;
} }

5
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/constants/UserConstants.java
View File

@ -28,9 +28,4 @@ public class UserConstants {
public static final String LOGIN_USER_NAME = "userName"; public static final String LOGIN_USER_NAME = "userName";
public static final String LOGIN_WORK_NUMBER = "workNumber"; public static final String LOGIN_WORK_NUMBER = "workNumber";
public static final String LOGIN_USER_ID = "userId"; public static final String LOGIN_USER_ID = "userId";
/**
* 管理员账号
*/
public static final String ADMIN_WORK_NUMBER = "100000";
} }