档案-修改档案查询，项目id没校验

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -183,7 +183,7 @@ public class ArchivesAutoController extends BladeController {
 				}
 			}
 		}catch (Exception e){
-			return R.data(null);
+			return R.data("查询失败:"+e.getMessage());
 		}
 	}
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -447,9 +447,7 @@
         from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join
         u_archive_file uaf on uaa.id = uaf.archive_id
         where uaa.is_deleted = 0 and uaa.is_archive = 1
-        <if test="vo.projectId != null and vo.projectId != ''">
             and matc.project_id = #{vo.projectId}
-        </if>
         <if test="vo.contractId != null and vo.contractId != ''">
             and uaa.contract_id = #{vo.contractId} and matc.contract_id = #{vo.contractId}
         </if>
@@ -507,9 +505,7 @@
             </foreach>
             )
         </if>
-        <if test="vo.projectId != null and vo.projectId != ''">
             and matc.project_id = #{vo.projectId}
-        </if>
         <if test="vo.contractId != null and vo.contractId != ''">
             and uaa.contract_id = #{vo.contractId} and matc.contract_id = #{vo.contractId}
         </if>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -160,6 +160,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 	@Override
 	public IPage<ArchivesAutoVO> pageByArchivesAuto(ArchivesAutoVO vo) {
+
+		if (vo.getProjectId() == null){
+			throw new ServiceException("请传入项目id");
+		}
 		IPage<ArchivesAutoVO> page = new Page<>(vo.getCurrent(), vo.getSize());
 		if (StringUtils.isNotBlank(vo.getStorageTime())) {
 			vo.setStorageTimes(Arrays.asList(vo.getStorageTime().split(",")));