员工离职异步操作

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

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
@@ -43,7 +42,7 @@ import org.springframework.util.CollectionUtils;
 
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  implements EmployeeService {
-	
+
 	@Autowired
 	private EmployeeDao employeeDao;
 	@Autowired
@@ -142,7 +141,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	}
 
 	@Override
-	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws Exception {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(user == null){
@@ -258,13 +256,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@Async
 	public void level(List<EmployeeLevelDto> employeeLevelDtos) {
 		Integer levelUserId = employeeLevelDtos.get(0).getLevelUserId();
-		//新增离职时间
-		employeeDao.updateUserDemissionDate(levelUserId);
-		//冻结用户
-		employeeDao.updateUserLock(levelUserId,1);
 		List<ImGroupModel> educationGroupModels = new ArrayList<>();
 		List<ImGroupModel> teamGroupModels = new ArrayList<>();
 		List<ImGroupModel> directorGroupModels = new ArrayList<>();
@@ -316,7 +309,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			//❤️用户加群
 			for (ImGroupModel imGroupModel : applyGroupModels) {
 				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
-				
+
 				List<ImGroupMember> memberList = imGroupModel.getMemberList();
 				for(ImGroupMember member : memberList){
 					userRoleMap.put(Integer.parseInt(member.getId()), imGroupModel.getUserRole());
@@ -340,7 +333,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			//❤️用户加群
 			for (ImGroupModel imGroupModel : teamGroupModels) {
 				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
-				
+
 				List<ImGroupMember> memberList = imGroupModel.getMemberList();
 				for(ImGroupMember member : memberList){
 					userRoleMap.put(Integer.parseInt(member.getId()), "运营主管");
@@ -352,7 +345,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			//❤️用户加群
 			for (ImGroupModel imGroupModel : directorGroupModels) {
 				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
-				
+
 				List<ImGroupMember> memberList = imGroupModel.getMemberList();
 				for(ImGroupMember member : memberList){
 					userRoleMap.put(Integer.parseInt(member.getId()), "乐队指导");
@@ -380,7 +373,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		}
 		//更换教务老师等数据
 		employeeDao.employeeLevel(employeeLevelDtos);
-
+		//新增离职时间
+		employeeDao.updateUserDemissionDate(levelUserId);
+		//冻结用户
+		employeeDao.updateUserLock(levelUserId,1);
 		if(musicGroupIds.size() > 0){
 			for (String musicGroupId : musicGroupIds) {
 				imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);