yonge 5 년 전
부모
커밋
926f51d3a2
1개의 변경된 파일1개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 6
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

+ 1 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -65,11 +65,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			employee.setUserType(SysUserType.SYSTEM);
 			teacherDao.updateUser(employee);
 			Employee employee1 = employeeDao.get(user.getId());
-			if(employee1 == null || employee1.getId() == null){
+			if(employee1 == null){
 				employee.setUserId(user.getId());
 				employeeDao.insert(employee);
-				//删除当前用户角色
-				employeeDao.delEmployeeRole(user.getId());
 				//新增用户角色
 				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds());
 			}
@@ -81,8 +79,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		teacherDao.addSysUser(employee);
 		employee.setUserId(employee.getId());
         employeeDao.insert(employee);
-		//删除当前用户角色
-		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		//添加用户现金账户
@@ -90,7 +86,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),
 				StringUtils.isEmpty(employee.getAvatar())?sysConfigDao.findConfigValue(SysConfigService.USER_DEFAULT_HEAD_URL):employee.getAvatar()));
 		employee.setImToken(imResult.getToken());
-		employeeDao.update(employee);
 		teacherDao.updateUser(employee);
 	}