From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index deb0c0c..fa197fe 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
+import com.moral.mapper.AccountMapper;
+import com.moral.service.AccountService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.data.annotation.Transient;
import org.springframework.stereotype.Service;
@@ -36,6 +38,9 @@
public class OrganizationServiceImpl implements OrganizationService {
@Resource
+ private AccountMapper accountMapper;
+
+ @Resource
private OrganizationMapper organizationMapper;
@Resource
@@ -60,10 +65,6 @@
return orgIds;
}
- @Override
- public Organization getOrganizationByMac(Map<String, Object> parameters) {
- return organizationMapper.getOrganizationByMac(parameters);
- }
@Override
public List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");
@@ -218,4 +219,12 @@
List<Organization> organizationList = organizationMapper.getOrganizationList(organizationName);
return organizationList;
}
+
+ @Override
+ public Organization getOrganizationByAccountId(Integer accountId) {
+ Map<String, Object> organizationId = accountMapper.getOrganizationIdByAccountId(accountId);
+ int orgId = (int) organizationId.get("organization_id");
+ Organization org = getOrganizationById(orgId);
+ return org;
+ }
}
--
Gitblit v1.8.0