diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptDecryptFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptDecryptFilter.java index 2e5aa2d..8dbb894 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptDecryptFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptDecryptFilter.java @@ -30,7 +30,7 @@ public class EncryptDecryptFilter implements Filter { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (!aesConfig.isEnabled()) { - logger.info("Encryption/Decryption is disabled. Skipping."); +// logger.info("Encryption/Decryption is disabled. Skipping."); chain.doFilter(request, response); return; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java index 3675667..3b99783 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/UserRealNameAuthenticationDTO.java @@ -9,6 +9,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; @@ -24,8 +25,8 @@ import java.util.List; public class UserRealNameAuthenticationDTO { @ApiModelProperty("主键") - @NotBlank(message = "主键不能为空") - private String id; + @NotNull(message = "主键不能为空") + private Long userId; @ApiModelProperty("姓名") @NotBlank(message = "姓名不能为空") diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 7170ff2..3305ccd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -17,6 +17,7 @@ import com.ruoyi.bgt.mapper.BgtProjectRecruitApplyMapper; import com.ruoyi.bgt.service.IBgtMessageService; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; @@ -231,6 +232,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl @Override @Transactional(rollbackFor = Exception.class) public Boolean realNameAuthentication(UserRealNameAuthenticationDTO dto) { - BgtUser bgtUser = BeanUtil.copyProperties(dto, BgtUser.class); + BgtUser bgtUser = baseMapper.selectOne(new LambdaQueryWrapper().eq(BgtUser::getUserId, dto.getUserId())); + if(bgtUser == null){ + throw new BaseException("用户不存在"); + } + BeanUtil.copyProperties(dto, bgtUser); + for (AnnexDTO annexDTO:dto.getAnnexList()){ + annexDTO.setUserId(dto.getUserId()); + annexDTO.setUserType(Constants.BGT); + annexDTO.setAnnexType("1"); + } annexService.insertBatch(dto.getAnnexList()); return baseMapper.updateById(bgtUser)>0; }