Quellcode durchsuchen

feat: B2B添加用户去除邮箱唯一限制

hejq vor 7 Jahren
Ursprung
Commit
e846c2da11

+ 5 - 10
src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -372,7 +372,7 @@ public class UserServiceImpl implements UserService {
         return users;
     }
 
-    static final String defaultPassword = "111111";
+    static final String DEFAULT_PASSWORD = "111111";
 
 	@Override
 	public User addUser(User user, HttpServletRequest request) {
@@ -380,11 +380,6 @@ public class UserServiceImpl implements UserService {
 		if (users.size() > 0) {
 			throw new IllegalOperatorException("电话号码重复,建议输入您自己的手机号");
 		}
-		List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail().trim());
-		if (users2.size() > 0) {
-			throw new IllegalOperatorException("邮箱地址重复,建议输入您自己的电子邮箱地址");
-		}
-
 		try {
 			Long userUU = addUserToAccountCenter(user);
 			user.setUserUU(userUU);
@@ -405,7 +400,7 @@ public class UserServiceImpl implements UserService {
 		}
 
 		// 发送邮件
-		Map<String, Object> model = new HashMap<String, Object>();
+		Map<String, Object> model = new HashMap<>(8);
 		model.put("userName", user.getUserName());
 		model.put("userUU", user.getUserUU());
 		model.put("userEmail", user.getUserEmail());
@@ -427,7 +422,7 @@ public class UserServiceImpl implements UserService {
 		userView.setIdCard(user.getUserIdcode());
 		userView.setMobile(user.getUserTel());
 		userView.setEmail(user.getUserEmail());
-		userView.setPassword(defaultPassword);
+		userView.setPassword(DEFAULT_PASSWORD);
 		userView.setSex(user.getUserSex());
 		return AccountUtils.addUser(SystemSession.getUser().getEnterprise().getUu(), userView).getUserUU();
 	}
@@ -484,9 +479,9 @@ public class UserServiceImpl implements UserService {
 		}
 		user.setCurrentEnterprise();
 		user = userDao.save(user);
-		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
+		user.setUserPwd(Md5Utils.encode(DEFAULT_PASSWORD, user.getUserUU()));
 		try {
-			user.setUserPwd(defaultPassword);
+			user.setUserPwd(DEFAULT_PASSWORD);
 			user = userDao.save(user);
 		} catch (Exception e) {
 			userDao.delete(user);