zouxuan 5 роки тому
батько
коміт
351b04e236

+ 4 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -79,12 +79,13 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
-				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
 				organ.setUserId(user.getId());
 				organDao.insert(organ);
+				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + organ.getId());
+				organDao.update(organ);
 				//新增用户角色
 				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
@@ -125,9 +126,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);
 
-		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + sysUser.getId());
 		organ.setUserId(sysUser.getId());
 		organDao.insert(organ);
+		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + organ.getId());
+		organDao.update(organ);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		if(sysUser.getRoles() != null){