|
@@ -13,6 +13,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.constant.GlobalConstant;
|
|
import com.xjrsoft.common.constant.GlobalConstant;
|
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
|
|
|
+import com.xjrsoft.common.enums.EnabledMark;
|
|
|
import com.xjrsoft.common.enums.GenderDictionaryEnum;
|
|
import com.xjrsoft.common.enums.GenderDictionaryEnum;
|
|
|
import com.xjrsoft.common.enums.JobStateEnum;
|
|
import com.xjrsoft.common.enums.JobStateEnum;
|
|
|
import com.xjrsoft.common.enums.RoleEnum;
|
|
import com.xjrsoft.common.enums.RoleEnum;
|
|
@@ -21,11 +22,13 @@ import com.xjrsoft.common.exception.MyException;
|
|
|
import com.xjrsoft.common.utils.RedisUtil;
|
|
import com.xjrsoft.common.utils.RedisUtil;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.config.CommonPropertiesConfig;
|
|
import com.xjrsoft.config.CommonPropertiesConfig;
|
|
|
|
|
+import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
import com.xjrsoft.module.liteflow.node.WfTeacherDepartNode;
|
|
import com.xjrsoft.module.liteflow.node.WfTeacherDepartNode;
|
|
|
import com.xjrsoft.module.organization.entity.*;
|
|
import com.xjrsoft.module.organization.entity.*;
|
|
|
import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
|
|
import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
|
|
|
import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
|
|
import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
|
|
|
import com.xjrsoft.module.organization.service.*;
|
|
import com.xjrsoft.module.organization.service.*;
|
|
|
|
|
+import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
|
|
|
import com.xjrsoft.module.system.entity.DictionaryDetail;
|
|
import com.xjrsoft.module.system.entity.DictionaryDetail;
|
|
|
import com.xjrsoft.module.system.entity.DictionaryItem;
|
|
import com.xjrsoft.module.system.entity.DictionaryItem;
|
|
|
import com.xjrsoft.module.system.service.IDictionarydetailService;
|
|
import com.xjrsoft.module.system.service.IDictionarydetailService;
|
|
@@ -88,6 +91,8 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
|
|
|
|
|
|
|
|
private WorkflowFormRelationMapper workflowFormRelationMapper;
|
|
private WorkflowFormRelationMapper workflowFormRelationMapper;
|
|
|
|
|
|
|
|
|
|
+ private final ITeacherFaceProcessService teacherFaceProcessService;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -820,6 +825,15 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void disabledUser(Long userId) {
|
|
public void disabledUser(Long userId) {
|
|
|
-
|
|
|
|
|
|
|
+ XjrUser xjrUser = this.getById(userId);
|
|
|
|
|
+ xjrUser.setDeleteMark(DeleteMark.DELETED.getCode());
|
|
|
|
|
+ xjrUser.setEnabledMark(EnabledMark.DISABLED.getCode());
|
|
|
|
|
+ this.updateById(xjrUser);
|
|
|
|
|
+
|
|
|
|
|
+ //清除海康人脸
|
|
|
|
|
+ teacherFaceProcessService.removeByUserId(userId);
|
|
|
|
|
+ List<Long> userIds = new ArrayList<>();
|
|
|
|
|
+ userIds.add(userId);
|
|
|
|
|
+ new DataUtil().deletePerson(userIds);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|