From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 505ff13..8a699d6 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -147,7 +147,10 @@
departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
}
}
- return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ if (classifyId==null)
+ return baseMapper.selectListByDepartmentId(departmentIds,null,null);
+ else
+ return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
}
@Override
@@ -224,6 +227,11 @@
}
}
+ @Override
+ public List<SysUser> queryList(Integer userType) {
+ return baseMapper.queryList(userType);
+ }
+
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
for (OrganizationChartEntity organizationChart:organizationChartEntities) {
departmentIds.add(organizationChart.getId().toString());
--
Gitblit v1.7.1