Browse Source

bug修复

master
luogw 7 days ago
parent
commit
4cf7454a39
  1. 2
      src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java
  2. 3
      src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java

2
src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java

@ -63,6 +63,7 @@ public class SaveAppealDomainServiceImpl implements SaveAppealDomainService {
} }
appealBaseService.saveOrUpdate(entity); appealBaseService.saveOrUpdate(entity);
appealDTO = appealBaseService.getById(appealDTO.getId()).toDTO(AppealDTO::new);
//如果审核通过,需要为用户加分 //如果审核通过,需要为用户加分
if (!appealDTO.getStatus().equals(AppealStatusEnum.PASS_REVIEW.getValue())) { if (!appealDTO.getStatus().equals(AppealStatusEnum.PASS_REVIEW.getValue())) {
@ -73,7 +74,6 @@ public class SaveAppealDomainServiceImpl implements SaveAppealDomainService {
return Result.success(appealDTO); return Result.success(appealDTO);
} }
appealDTO = appealBaseService.getById(appealDTO.getId()).toDTO(AppealDTO::new);
ExamRecordEntity examRecord = examRecordMapper.selectById(appealDTO.getExamId()); ExamRecordEntity examRecord = examRecordMapper.selectById(appealDTO.getExamId());
if (examRecord == null){ if (examRecord == null){
throw new BusinessErrorException("用户未该场考试"); throw new BusinessErrorException("用户未该场考试");

3
src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java

@ -12,6 +12,7 @@ import com.project.ding.application.DepartmentApplicationService;
import com.project.ding.application.UserApplicationService; import com.project.ding.application.UserApplicationService;
import com.project.ding.domain.dto.DepartmentDTO; import com.project.ding.domain.dto.DepartmentDTO;
import com.project.ding.domain.dto.UserDTO; import com.project.ding.domain.dto.UserDTO;
import com.project.ding.utils.ChineseNameEncryptUtil;
import com.project.operation.domain.dto.OperationLogDTO; import com.project.operation.domain.dto.OperationLogDTO;
import com.project.operation.domain.entity.OperationLogEntity; import com.project.operation.domain.entity.OperationLogEntity;
import com.project.operation.domain.param.OperationLogParam; import com.project.operation.domain.param.OperationLogParam;
@ -98,7 +99,7 @@ public class SearchOperationLogDomainServiceImpl implements SearchOperationLogDo
return operationLogDTO; return operationLogDTO;
} }
UserDTO userDTO = userDTOMap.get(operationLogDTO.getCreatorId().toString()); UserDTO userDTO = userDTOMap.get(operationLogDTO.getCreatorId().toString());
operationLogDTO.setUsername(DesensitizedUtil.chineseName(userDTO.getName())); operationLogDTO.setUsername(ChineseNameEncryptUtil.encryptChineseName(userDTO.getName()));
operationLogDTO.setPosition(userDTO.getTitle()); operationLogDTO.setPosition(userDTO.getTitle());
if (StringUtils.isBlank(userDTO.getDeptIdStr())) { if (StringUtils.isBlank(userDTO.getDeptIdStr())) {

Loading…
Cancel
Save