Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/mapper/RecycleBinInfoMapper.xml

@@ -90,6 +90,6 @@
             <foreach collection="ids" item="id" separator=",">
                 #{id}
             </foreach>
-            ) and is_deleted = 0 group by del_root_id )  group by del_root_id, del_root_name having count(1) > 1
+            ) and is_deleted = 0 group by del_root_id ) and status = 0  group by del_root_id, del_root_name having count(1) > 1
     </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/RecycleBinInfoServiceImpl.java

@@ -107,7 +107,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
             set.addAll(userVOs1);
             return set;
         }
-        return userVOs;
+        return userVOs1;
     }
 
     @Override

blade-service/blade-repair/src/main/java/org/springblade/repair/controller/CheckAndRepairController.java

@@ -742,7 +742,7 @@ public class CheckAndRepairController {
     public void checkAndRepairElementAndHtml() throws Exception {
         String sql=" select id,tab_en_name from m_table_info where is_deleted=0";
         List<TableInfo> TableInfoList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TableInfo.class));
-        int i=TableInfoList.size();
+        int i=1;
         for (TableInfo tableInfo : TableInfoList) {
             String sql1="select e_key,e_name from m_wbs_form_element where f_id="+tableInfo.getId()+" and is_deleted=0";
             List<WbsFormElement> wbsFormElementList = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(WbsFormElement.class));
@@ -774,6 +774,7 @@ public class CheckAndRepairController {
                 }
             }
             System.out.println("已处理"+i+"条数据,还剩下条"+(TableInfoList.size()-i)+"数据："+tableInfo.getId());
+            i++;
         }
     }
 }