update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -140,53 +140,33 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		if("register".equals(isRegister)){
 			throw new UsernameNotFoundException("404.9");
 		}
-		if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setRealName("老师" + phone.substring(phone.length() - 6));
-			sysUser.setUserType("TEACHER");
-			sysUserDao.insert(sysUser);
-			//添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			//sysTenantAccount
-			sysUserDao.insertSysTenantAccount(sysUser.getId());
-			//创建teacher表
-			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
-			return queryUserInfoByPhone(phone);
-		}else if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setUsername("学生" + phone.substring(phone.length() - 6));
-			sysUser.setUserType("STUDENT");
-			sysUser.setOrganId(lesseeOrganId);
-			sysUserDao.insert(sysUser);
-			//添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			return queryUserInfoByPhone(phone);
-		}
-		if(autoRegister){
-			if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
+		if(StringUtils.isNotEmpty(isLessee) || autoRegister){
+			if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
+				SysUser sysUser = new SysUser();
+				sysUser.setPhone(phone);
+				sysUser.setRealName("老师" + phone.substring(phone.length() - 6));
+				sysUser.setUserType("TEACHER");
+				sysUserDao.insert(sysUser);
+				//添加用户现金账户
+				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
+				userFeignService.createCashAccount(sysUser.getId());
+				//sysTenantAccount
+				sysUserDao.insertSysTenantAccount(sysUser.getId());
+				//创建teacher表
+				sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
+				return queryUserInfoByPhone(phone);
+			}else if(StringUtils.isNotEmpty(isLessee) && StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
 				SysUser sysUser = new SysUser();
 				sysUser.setPhone(phone);
+				sysUser.setUsername("学生" + phone.substring(phone.length() - 6));
 				sysUser.setUserType("STUDENT");
-				sysUser.setOrganId(36);
+				sysUser.setOrganId(lesseeOrganId);
 				sysUserDao.insert(sysUser);
 				//添加用户现金账户
 				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 				userFeignService.createCashAccount(sysUser.getId());
 				return queryUserInfoByPhone(phone);
 			}
-		}else if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
-			SysUser sysUser = new SysUser();
-			sysUser.setPhone(phone);
-			sysUser.setUserType("STUDENT");
-			sysUserDao.insert(sysUser);
-            //添加用户现金账户
-			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
-			return queryUserInfoByPhone(phone);
 		}
 		throw new UsernameNotFoundException("404.9");
 	}