Antiloveg 8 years ago
parent
commit
ff35ddfc3c

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -128,7 +128,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/addNewUser", method = RequestMethod.POST)
 	public Result addNewUser(String mobile, Integer type, String unitName) {
 		Result res = new Result();
-		User user = userService.selectByMobieAndType(mobile, type);
+		User user = userService.selectByMobieAndType(mobile.trim(), type);
 		if (null != user) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;

+ 0 - 2
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -77,9 +77,7 @@ public class UserRegisterController extends BaseController {
 		} else {
 			User u = userService.selectByMobieAndType(user.getMobile().trim(), user.getType());
 			if (null != u) {
-				if (u.getMobile().equals(user.getMobile()) && u.getType() == user.getType()) {
 					res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户名已存在"));
-				}
 			}
 		}
 		if (res.getError().isEmpty()) {

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -39,7 +39,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	@Override
 	public User insertRegister(User user,String contacts,String unitName) {
 		userMapper.insert(user);
-		if (1 == user.getType()){
+		if (null != user.getType() && 1 == user.getType()){
 			if (!StringUtils.isBlank(unitName) || !StringUtils.isBlank(contacts)){
 				OrganizationIdentity organizationIdentity = new OrganizationIdentity();
 				organizationIdentity.setUid(user.getId());