万盛计量日志适应所有万盛计量模板项目

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

@@ -796,6 +796,7 @@
         </foreach>
         AND project_id = #{projectId}
         AND wbs_id = #{wbsId}
+        AND is_deleted = 0
     </select>
 
 

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3950,7 +3950,8 @@ public class TaskController extends BladeController {
         String sql = "select id,reference_wbs_template_id_meter from m_project_info where id = "+projectId;
         ProjectInfo projectInfo = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(ProjectInfo.class));
         if(ObjectUtil.isNotEmpty(projectInfo) && ObjectUtil.isNotEmpty(projectInfo.getReferenceWbsTemplateIdMeter())){
-            if(projectInfo.getReferenceWbsTemplateIdMeter().toString().equals("1781150898360209410")){
+            String meterNum = projectInfo.getReferenceWbsTemplateIdMeter().toString();
+            if(meterNum.equals("1781150898360209410") || meterNum.equals("1784416287884050432")){
                 return true;
             }else {
                 return false;