|
|
@@ -13,6 +13,7 @@ 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;
|
|
|
@@ -141,6 +142,7 @@ 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){
|
|
|
@@ -259,6 +261,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
|
@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<>();
|
|
|
@@ -374,10 +380,7 @@ 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);
|
zouxuan