Эх сурвалжийг харах

试验-保存
1、保存时过滤隐藏表单(非空判断)

LHB 2 өдөр өмнө
parent
commit
4ff81c8a4a

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -552,13 +552,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             wbsTreePrivateVO4s.addAll(wbsTreePrivateVO);
             tableAll = BeanUtil.copyProperties(wbsTreePrivateVO4s, NodeTable.class);
             if(recordId != null){
-                tableAll = tableAll.stream().filter(e -> e.getIsBussShow() == 1).collect(Collectors.toList());
+                tableAll = tableAll.stream().filter(e -> e.getIsBussShow() == null || e.getIsBussShow() == 1).collect(Collectors.toList());
                 List<NodeTable> nodeTables = new ArrayList<>();
                 //处理试验 过滤掉隐藏表单
                 tableAll.forEach(e -> {
                     String sql = "select tab_id,is_buss_show,is_tab_pdf,is_tab_file_type from u_trial_self_data_record where record_id = " + recordId + " and tab_id = " + e.getPKeyId();
-                    TrialSelfDataRecord query = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(TrialSelfDataRecord.class));
-                    if(query != null && query.getIsBussShow() == 1){
+                    List<TrialSelfDataRecord> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TrialSelfDataRecord.class));
+                    if(CollectionUtil.isNotEmpty(query) && query.get(0).getIsBussShow() == 1){
                         nodeTables.add(e);
                     }
                 });