项目删除，响应的文物，场景不能查看

gis_cms/src/main/java/com/gis/cms/entity/po/GoodsEntity.java

@@ -53,6 +53,10 @@ public class GoodsEntity extends BaseEntity {
     @ApiModelProperty(value = "文物类别")
     private String goodsTypeName;
 
+    @Transient
+    @ApiModelProperty(value = "保密级别")
+    private Integer level;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/mapper/provider/GoodsProvider.java

@@ -14,10 +14,10 @@ public class GoodsProvider {
 
     public String search(GoodsPageDto param, Integer display) {
         StringBuffer sql = new StringBuffer(
-                "select a.*,b.name as goodsTypeName, c.name as projectName, d.name as projectTypeName from tb_goods a " +
+                "select a.*,b.name as goodsTypeName, c.name as projectName, c.level as level, d.name as projectTypeName from tb_goods a " +
                         "left join tb_goods_type b on b.id=a.goods_type_id " +
                         "left join tb_project c on c.id=a.project_id " +
-                        "left join tb_project_type d on d.id=c.type_id where a.is_delete=0 and a.project_id is not NULL ");
+                        "left join tb_project_type d on d.id=c.type_id where a.is_delete=0 and c.is_delete=0 and a.project_id is not NULL ");
 
 //        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 //
@@ -51,7 +51,7 @@ public class GoodsProvider {
 
 
     public String strSql(String strSql) {
-        log.info("sql: {}", strSql);
+        log.warn("sql: {}", strSql);
         return strSql;
     }
 

gis_cms/src/main/java/com/gis/cms/mapper/provider/SceneProvider.java

@@ -15,7 +15,7 @@ public class SceneProvider {
     public String search(ScenePageDto param) {
         StringBuffer sql = new StringBuffer(
                 "select a.*, b.name as projectName, c.name as projectTypeName from tb_scene a left join tb_project b on b.id=a.project_id " +
-                        "left join tb_project_type c on c.id=b.type_id   where a.is_delete=0 and a.type='scene' ");
+                        "left join tb_project_type c on c.id=b.type_id   where a.is_delete=0 and b.is_delete=0 and  a.type='scene' ");
 
 //        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 //