修改功能

heheng

6 天以前 189849927e37278c8bc03202bd714aca7a0f8f7d

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java

@@ -24,6 +24,7 @@
import com.gkhy.exam.system.domain.vo.EmployeeRecordVO;
import com.gkhy.exam.system.domain.vo.SpSysUser;
import com.gkhy.exam.system.mapper.EmployeeRecordMapper;
import com.gkhy.exam.system.mapper.ExStudentMapper;
import com.gkhy.exam.system.mapper.SysUserMapper;
import com.gkhy.exam.system.mapper.SysUserRoleMapper;
import com.gkhy.exam.system.service.ExStudentService;
@@ -65,6 +66,9 @@

    @Autowired
    private EmployeeRecordMapper employeeRecordMapper;

    @Autowired
    private ExStudentMapper exStudentMapper;


    @Override
@@ -153,8 +157,6 @@
    public SysUser selectUserById(Long userId) {




        return baseMapper.getUserById(userId);
    }

@@ -185,6 +187,7 @@

        batchSaveRole(user.getRoles(), user.getId(), false);

        if (user.getCompanyId() != null) {
        ExStudent exStudent = new ExStudent();
        exStudent.setCompanyId(user.getCompanyId());
        exStudent.setName(user.getName());
@@ -195,7 +198,6 @@
        exStudent.setPhone(user.getPhone());
        exStudent.setUserId(user.getId());
        exStudentService.insertStudent(exStudent);

        Integer internal = user.getInternal();
        if (internal == 0){
            EmployeeRecord employeeRecord = new EmployeeRecord();
@@ -205,6 +207,8 @@
            employeeRecord.setCreateTime(LocalDateTime.now());
            saveEmployeeRecord(employeeRecord);
        }
        }


        if (row < 1) {
            throw new ApiException("新增用户失败");
@@ -260,10 +264,23 @@
        }else {
            user.setPassword(null);
        }
        if (sysUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) && !user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
            if (user.getCompanyId() == null){
                throw new ApiException("请选择所属公司");
            }
        }
        if (user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) && !sysUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
           user.setCompanyId(null);
           delEmployeeRecord(user.getId());
            LambdaUpdateWrapper<ExStudent> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(ExStudent::getUserId, user.getId()).set(ExStudent::getDelFlag, 1)
                    .set(ExStudent::getUpdateBy, SecurityUtils.getUsername()).set(ExStudent::getUpdateTime, LocalDateTime.now());
            exStudentMapper.update(new ExStudent(),updateWrapper);
        }

        int row = baseMapper.updateById(user);
        batchSaveRole(user.getRoles(), user.getId(), true);

        if (user.getCompanyId() != null){
        if (sysUser.getInternal() == 0 && sysUser.getInternal() == 1){
            delEmployeeRecord(user.getId());
        }else if (sysUser.getInternal() == 1 && user.getInternal() == 0){
@@ -274,6 +291,8 @@
            employeeRecord.setCreateTime(LocalDateTime.now());
            saveEmployeeRecord(employeeRecord);
        }
        }


        if (row < 1) {
            throw new ApiException("更新用户信息失败");