From 6e1bea68ff4e6c13b170e82e4915009a2f0ad6dc Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Wed, 14 Dec 2022 11:38:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=202.=E8=83=BD=E5=8A=9B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=203.sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/renren/modules/fuse/dto/TbFuseDTO.java  |  4 +++-
 .../io/renren/modules/fuse/entity/TbFuseEntity.java |  2 +-
 .../src/main/resources/db/V8.3__tb_fuse_add_col.sql |  1 -
 .../src/main/resources/db/V8.4__tb_fuse_add_col.sql |  2 ++
 .../src/main/resources/mapper/fuse/TbFuseDao.xml    |  1 +
 .../main/resources/mapper/resource/ResourceDao.xml  | 13 ++++++++-----
 .../src/main/resources/mapper/sys/SysRegionDao.xml  |  2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 renren-admin/src/main/resources/db/V8.3__tb_fuse_add_col.sql
 create mode 100644 renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql

diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
index 9eb0728b..ee20aba7 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
@@ -58,8 +58,10 @@ public class TbFuseDTO {
     private Integer dataSourceCount;
     @ApiModelProperty(value = "组件服务数量")
     private Integer componentCount;
-    @ApiModelProperty(value = "组件服务数量")
+    @ApiModelProperty(value = "赋能场景类型：0市级，1基层")
     private Integer district;
+    @ApiModelProperty(value = "基层赋能场景所属地区")
+    private String area;
 
 
 }
diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
index 58e4d62a..6b8c1a55 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
@@ -80,5 +80,5 @@ public class TbFuseEntity extends BaseEntity {
     private Integer dataSourceCount;
     private Integer componentCount;
     private Integer district;
-
+    private String area;
 }
diff --git a/renren-admin/src/main/resources/db/V8.3__tb_fuse_add_col.sql b/renren-admin/src/main/resources/db/V8.3__tb_fuse_add_col.sql
deleted file mode 100644
index c752b342..00000000
--- a/renren-admin/src/main/resources/db/V8.3__tb_fuse_add_col.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景';
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql b/renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
new file mode 100644
index 00000000..cd5562b6
--- /dev/null
+++ b/renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
@@ -0,0 +1,2 @@
+ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景',
+    ADD COLUMN `area` varchar(128) NULL COMMENT '基层赋能场景所属地区';
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
index 6ac06ab3..f98606e6 100644
--- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
+++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
@@ -20,6 +20,7 @@
         <result property="dataSourceCount" column="data_source_count"/>
         <result property="componentCount" column="component_count"/>
         <result property="district" column="district"/>
+        <result property="area" column="area"/>
     </resultMap>
 
     <select id="getFuseDTOList" resultMap="fuseDTO">
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 8ba14b74..8d4c3773 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1884,20 +1884,20 @@
         FROM
         (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date FROM
         tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
-        a.del_flag=0 WHERE d.type IN ('应用资源', '组件服务') AND d.del_flag = 0) tdr,
+        a.del_flag=0 WHERE d.type IN ('应用资源', '组件服务') AND d.del_flag NOT IN (1, 5)) tdr,
         sys_dept sd
         WHERE
         1 = 1
         AND tdr.dept_id = sd.id
         <choose>
             <when test="approveStatus != null and approveStatus == '通过'">
-                AND tdr.del_flag=0
+                AND tdr.del_flag = 0
             </when>
             <when test="approveStatus != null and approveStatus == '审核中'">
                 AND tdr.del_flag in (2, 3, 4)
             </when>
             <when test="approveStatus != null and approveStatus == '不通过'">
-                AND tdr.del_flag=6
+                AND tdr.del_flag = 6
             </when>
             <otherwise>
                 AND tdr.del_flag in (0, 2, 3, 4, 6)
@@ -1926,7 +1926,7 @@
             tdr.name AS resourceName,
             tdr.type,
             DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
-            CASE WHEN (tdr.del_flag = 0 OR tdr.del_flag = 5) THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
+            CASE WHEN tdr.del_flag = 0 THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
             trma.instance_id AS applyNumber
         FROM
         (SELECT
@@ -1938,7 +1938,10 @@
                 d.name
             FROM tb_data_resource d
             LEFT JOIN tb_data_attr a ON d.id = a.data_resource_id AND a.attr_type = '组件类型' AND a.del_flag = 0
-            WHERE d.type IN ('应用资源','组件服务')
+            WHERE
+                1 = 1
+                AND d.del_flag NOT IN (1, 5)
+                AND d.type IN ('应用资源','组件服务')
         ) tdr
         LEFT JOIN t_resource_mount_apply trma on tdr.id = trma.resource_id,
         sys_dept sd
diff --git a/renren-admin/src/main/resources/mapper/sys/SysRegionDao.xml b/renren-admin/src/main/resources/mapper/sys/SysRegionDao.xml
index 61ff182b..7be5ceac 100644
--- a/renren-admin/src/main/resources/mapper/sys/SysRegionDao.xml
+++ b/renren-admin/src/main/resources/mapper/sys/SysRegionDao.xml
@@ -21,7 +21,7 @@
     </select>
 
     <select id="getListByLevel" resultType="io.renren.modules.sys.entity.SysRegionEntity">
-        select id, pid, name from sys_region where level = #{value} order by sort
+        select id, pid, name from sys_region where tree_level = #{value} order by sort
     </select>
 
     <select id="getById" resultType="io.renren.modules.sys.entity.SysRegionEntity">