From 2d25e6b0185514c95552c41af1da371cc1cc17cd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 17:52:42 +0800
Subject: [PATCH] 修改办事指南所属部门集合
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index a474dfa..4a06ce0 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -90,7 +90,7 @@
for (OrganizationChartEntity organizationChart : organizationChartEntities) {
departmentIds.add(organizationChart.getId().toString());
}
- List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
for (OrganizationChartEntity organizationChart : organizationChartEntities) {
//获取下级部门
@@ -99,16 +99,19 @@
if (organizationChartEntitiesUser != null)
departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds);
}
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {//如果该所属地区没有导办人员则为获取其上級地区有没有相关分类导办人员
List<String> departmentIdsParent = new ArrayList<>();
departmentIdsParent.addAll(departmentIds);
for (String departmentId : departmentIdsParent) {
OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
- departmentIds.add(organizationChartParent.getId().toString());
+ if (organizationChartParent!=null)
+ {
+ departmentIds.add(organizationChartParent.getId().toString());
+ }
}
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {
sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员
if (sysUsers.size() == 0) {
@@ -226,14 +229,15 @@
@Override
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
String matterName, List<String> ids, String status,
- String guideUserId) {
- return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime,
+ String createTimeTimeEndTime,String classifyId) {
+ return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
}
@Override
public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
- String guideUserId) {
- return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
+ return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
}
@Override
@@ -361,7 +365,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -393,7 +397,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1