From e76d382202ed5c8286b09593e05b2c36acde1c0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 15:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 dc96213..7d504cc 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
@@ -37,6 +37,7 @@
guideRepairOrder.setMatterName(transactionEvent.getMatterName());
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
+ sysUserMapper.selectListByDepartmentId(null, "," + guideRepairOrder.getMatterId(), guideRepairOrder.getMatterId() + ",")
guideRepairOrder.setState("1");
guideRepairOrder.setCreateTime(LocalDateTime.now());
guideRepairOrder.setUpdateTime(LocalDateTime.now());
@@ -91,13 +92,13 @@
}
@Override
- public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName) {
- return baseMapper.selectConfigList(page,state,matterName);
+ public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,matterName, ids);
}
@Override
- public int countConfigList(String matterName) {
- return baseMapper.countConfigList(matterName);
+ public int countConfigList(String matterName,List<String> ids) {
+ return baseMapper.countConfigList(matterName,ids);
}
--
Gitblit v1.7.1