Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java

@@ -485,6 +485,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             map.put("modify_time", new Date());
             map.put("sts", "Y");
             map.put("data_status","F");//数据状态
+            map.put("add_status", "0");//新增状态
             map.put("update_status","0");//修改状态
             map.remove("id");
             comparisonEntity.setMap(map);
@@ -622,10 +623,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id");
             }
 
-            //递归删除树结构  1.树  2.列表
+            /*//递归删除树结构  1.树  2.列表
             if(comparisonEntities.get(0).getViewName().equals("1")){
                return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity);
-            }
+            }*/
 
             String id = String.valueOf(comparisonEntitiePages.get(0).get("id"));