From 2dd09e76bb94579a169830416b519bec0ef9e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 19 Dec 2019 15:49:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 11 +++++++++ .../main/resources/mapper/item/ItemDao.xml | 23 +++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index d27844bb7..221f6d5ae 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -117,6 +117,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null == user) { throw new RuntimeException("获取用户信息失败"); } + if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { + if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { + Result resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString())); + SysDeptDTO dept =resultdept.getData(); + Object deptId = params.get("streetId"); + if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) { + params.put("districtDeptId",deptId); + params.remove("streetId"); + } + } + } //部门ID列表 List deptIdList = new ArrayList<>(); // 判断是否为网格，不为网格只能查看本部门下的项目数据 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index d3bab7632..c66f30c68 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -402,21 +402,26 @@ #{deptId} - - AND dept.DEPT_ID = #{gridId} + + AND dept.DEPT_ID = #{districtDeptId} - - AND dept.DEPT_ID = #{streetId} - - - AND dept.DEPT_ID = #{communityId} - - ) temp ) AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + AND (item.GRID_ID = #{gridId} + OR find_in_set(#{gridId},item.ALL_DEPT_IDS)) + + + AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},item.ALL_DEPT_IDS)) + + + AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},item.ALL_DEPT_IDS)) + AND item.ITEM_CODE like concat('%', #{itemCode}, '%') From 273e5930093ff9bc1edcd181f40d8ee4d8366265 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 19 Dec 2019 15:58:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/category/entity/CategoryEntity.java | 10 ++++++++++ .../src/main/resources/mapper/category/CategoryDao.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index d66203557..79f60d255 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -99,4 +99,14 @@ public class CategoryEntity extends BaseEntity { @TableField(exist = false) private String label; + /** + * 第三方平台分类编码 + */ + private String infoCode; + + /** + * 启用标识（0-否，1-是） + */ + private String enableFlag; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml index 670d6aaf2..1ab8ddeeb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml @@ -21,7 +21,7 @@