Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql

@@ -0,0 +1,9 @@
+-- 1、增加字典类型
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000011, 'age_group', '年龄范围', '', 11, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+
+-- 2、增加字典数据
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000230, 1000000000000000011, '50岁以下', '0', '', 0, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000231, 1000000000000000011, '50-59岁', '1', '', 1, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000232, 1000000000000000011, '60-69岁', '2', '', 2, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000233, 1000000000000000011, '70-79岁', '3', '', 3, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000234, 1000000000000000011, '80岁以上', '4', '', 4, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -621,7 +621,7 @@
                 AND i.GRID_ID = #{orgId}
             </if>
             <if test='orgType == "agency" '>
-                AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
+                AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
             </if>
         ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50
     </select>
@@ -653,7 +653,7 @@
                     AND i.GRID_ID = #{orgId}
                 </if>
                 <if test='orgType == "agency" '>
-                    AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
+                    AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
                 </if>
             ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp
         GROUP BY categoryName

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -407,7 +407,7 @@
         FROM project p
         INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0)
         WHERE p.DEL_FLAG = 0
-          AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
+          AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
           AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate}
           AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         ORDER BY projectId
@@ -478,7 +478,7 @@
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId})
+                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </foreach>