gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.6】【statistics】修改代码

pull/26/MERGE
xixiaowei 2022-02-11 17:54:06 +08:00
parent 28b7d63dfc
commit 384bade526
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java
View File

@ -129,14 +129,15 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi
// 设置公司部门数 // 设置公司部门数
int sectionNum = 1; int sectionNum = 1;
// 去除[] 的部门集合 List<Long> orgIds = new ArrayList<>();
List<String> orgPidList = new ArrayList<>(); // 添加当前用户部门ID
orgIds.add(organizationId);
for (HrOrganization hrOrganization : hrOrganizationList) { for (HrOrganization hrOrganization : hrOrganizationList) {
String[] orgPids = hrOrganization.getOrgPids().split(","); String[] orgPids = hrOrganization.getOrgPids().split(",");
for (String orgPid : orgPids) { for (String orgPid : orgPids) {
orgPid = orgPid.substring(1, orgPid.length() - 1); orgPid = orgPid.substring(1, orgPid.length() - 1);
if (organizationId.toString().equals(orgPid)) { if (organizationId.toString().equals(orgPid)) {
orgPidList.add(orgPid); orgIds.add(hrOrganization.getOrgId());
sectionNum++; sectionNum++;
} }
} }
@ -145,7 +146,7 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi
// 设置当前公司人数 // 设置当前公司人数
int currentCompanyPersonNum = 0; int currentCompanyPersonNum = 0;
for (String orgId : orgPidList) { for (Long orgId : orgIds) {
List<SysUserOrg> sysUserOrgs = sysUserOrgService.list(Wrappers.<SysUserOrg>lambdaQuery().eq(SysUserOrg::getOrgId, orgId)); List<SysUserOrg> sysUserOrgs = sysUserOrgService.list(Wrappers.<SysUserOrg>lambdaQuery().eq(SysUserOrg::getOrgId, orgId));
currentCompanyPersonNum += sysUserOrgs.size(); currentCompanyPersonNum += sysUserOrgs.size();
} }
@ -187,6 +188,11 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi
sysStatisticsCount.setUserId(Long.valueOf(userId)); sysStatisticsCount.setUserId(Long.valueOf(userId));
Map<Long, Integer> map = userRequestStats.get(userId); Map<Long, Integer> map = userRequestStats.get(userId);
for (Long statUrlId : map.keySet()) { for (Long statUrlId : map.keySet()) {
SysStatisticsCount statisticsCount = sysStatisticsCountService.getOne(Wrappers.<SysStatisticsCount>lambdaQuery().eq(SysStatisticsCount::getStatUrlId, statUrlId));
// 判断是否已存在该记录，如果存在更新次数，不存在添加记录
if (ObjectUtil.isNotNull(statisticsCount)) {
sysStatisticsCount.setStatCountId(statisticsCount.getStatCountId());
}
sysStatisticsCount.setStatUrlId(statUrlId); sysStatisticsCount.setStatUrlId(statUrlId);
sysStatisticsCount.setStatCount(map.get(statUrlId)); sysStatisticsCount.setStatCount(map.get(statUrlId));
} }