Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -65,6 +65,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 	@Override
 	public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) {
 		LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
+		wrapper.isNotNull(TEmpContractAlert::getId);
 		if (Common.isNotNull(searchVo.getContractEndStart())){
 			wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
 		}