。。。

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -238,6 +238,7 @@ public class UserController extends ControllerSupport {
 		userEntity.setPassword(userForm.getPassword());
 		userEntity.setScope(UserScope.ORG);
 		userEntity.setType(UserType.NOT_STUDENT);
+		userEntity.setUpdateTime(new Date());
 
 		List<UserRole> userRoles = Lists.newArrayList();
 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -21,10 +20,10 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.util.ByteUtil;
 import cn.com.qmth.examcloud.commons.base.util.SHA256;
 import cn.com.qmth.examcloud.commons.base.util.StringUtil;
-import cn.com.qmth.examcloud.commons.web.security.AccessCtrlUtil;
 import cn.com.qmth.examcloud.commons.web.security.AccessUserOps;
 import cn.com.qmth.examcloud.commons.web.security.AccessUserOpsForRedis;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
@@ -504,27 +503,13 @@ public class UserServiceImpl  implements UserService{
 		return specification;
 	}
 	
-	public UserEntity save(UserEntity user){
-        user.setCreateTime(new Date());
-		checkLoginName(user.getRootOrgId(), user.getLoginName());
-		return userRepo.save(user);
-	}
-
-	private void checkLoginName(Long rootOrgId,String loginName) {
-		UserEntity old = userRepo.findByRootOrgIdAndLoginName(rootOrgId,loginName);
-		if(old!=null){
-			throw new RuntimeException("用户名已存在");
-		}else if("admin".equalsIgnoreCase(loginName)){
-		    throw new RuntimeException("不能创建admin用户");
-        }
-	}
-
-	public UserEntity update(Long id, UserEntity user) {
-		UserEntity old =  userRepo.findOne(id);
-		if(!old.getLoginName().equals(user.getLoginName())){
-			checkLoginName(user.getRootOrgId(), user.getLoginName());
+	public UserEntity save(UserEntity user) {
+		user.setCreateTime(new Date());
+		UserEntity one = userRepo.findByRootOrgIdAndLoginName(user.getRootOrgId(),
+				user.getLoginName());
+		if (one != null && (!one.getId().equals(user.getId()))) {
+			throw new StatusException("B-150002", "登录名已存在");
 		}
-		user.setUpdateTime(new Date());
 		return userRepo.save(user);
 	}