Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TenantInfoController.java

@@ -57,9 +57,8 @@ public class TenantInfoController extends BaseController {
 	@ApiOperation("更新机构")
 	@PostMapping(value = "/update")
 	public HttpResponseResult update(@RequestBody TenantInfoDto tenantInfo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(!sysUser.getIsSuperAdmin()){
-			String tenantId = TenantContextHolder.getTenantId();
+		String tenantId = TenantContextHolder.getTenantId();
+		if(StringUtils.isNotEmpty(tenantId)){
 			tenantInfo.setId(Integer.parseInt(tenantId));
 		}
 		tenantInfo.setUpdateTime(new Date());

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

@@ -163,11 +163,15 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setRealName(organization.getName());
 		sysUser.setPhone(organization.getContactPhone());
 		organDao.update(organization);
+
+		organDao.getChildOrgans(organization.getParentOrganIdTag());
 		//删除当前用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		//新增用户角色
 		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
 			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+			//删除当前用户以及子集用户角色
+			//新增当前用户和子集用户角色
 		}
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));