Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml

@@ -221,8 +221,8 @@
     <select id="selectTabExcelNodeList" resultType="org.springblade.manager.vo.WbsFormElementDetailTabExcelVO">
         SELECT
             a.id,
-            ( SELECT NAME FROM m_excel_tab WHERE id = SUBSTRING_INDEX( a.alias, ',', 1 ) ) tableName,
-            ( SELECT NAME FROM m_excel_tab WHERE id = a.parent_id ) nodeName
+            a.NAME nodeName,
+            ( SELECT NAME FROM m_excel_tab WHERE id = SUBSTRING_INDEX( a.alias, ',', 1 ) ) tableName
         FROM
             m_excel_tab a
         WHERE

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java

@@ -37,9 +37,9 @@ public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo>
         if (StringUtil.hasText(wbsInfo.getProjectName()) || StringUtil.isNumeric(wbsInfo.getProjectId())) {
             List<ProjectInfo> projectInfoList;
             if (StringUtil.isNumeric(wbsInfo.getProjectId())) {
-                projectInfoList = jdbcTemplate.query("select * from m_project_info where id = " + wbsInfo.getProjectId(), new BeanPropertyRowMapper<>(ProjectInfo.class));
+                projectInfoList = jdbcTemplate.query("select * from m_project_info where id = " + wbsInfo.getProjectId()+" and is_deleted=0", new BeanPropertyRowMapper<>(ProjectInfo.class));
             } else {
-                projectInfoList = jdbcTemplate.query("select * from m_project_info where project_name like '%" + wbsInfo.getProjectName() + "%'", new BeanPropertyRowMapper<>(ProjectInfo.class));
+                projectInfoList = jdbcTemplate.query("select * from m_project_info where project_name like '%" + wbsInfo.getProjectName() + "%'"+" and is_deleted=0", new BeanPropertyRowMapper<>(ProjectInfo.class));
             }
             if (projectInfoList.isEmpty()) {
                 return page;
@@ -77,7 +77,7 @@ public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo>
         if (!records.isEmpty()) {
             for (WbsInfo record : records) {
                 List<ProjectInfo> projectInfoList = jdbcTemplate.query("select id, project_name from m_project_info where reference_log_wbs_template_id = ? " +
-                                "or reference_wbs_template_id = ? or reference_wbs_template_id_trial = ? or reference_wbs_template_id_lar = ? or reference_wbs_template_id_meter = ?"
+                                "or reference_wbs_template_id = ? or reference_wbs_template_id_trial = ? or reference_wbs_template_id_lar = ? or reference_wbs_template_id_meter = ? and is_deleted=0"
                         ,new Object[]{record.getId(), record.getId(), record.getId(), record.getId(), record.getId()} ,new BeanPropertyRowMapper<>(ProjectInfo.class));
                 if (!projectInfoList.isEmpty()) {
                     record.setProjectInfoList(projectInfoList);