From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
index 1292cd5..291870e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
@@ -2,14 +2,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUserOrg;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.usercenter.mapper.SysUserOrgMapper;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,6 +29,8 @@
@Slf4j
@Service
public class SysUserOrgServiceImpl extends SuperServiceImpl<SysUserOrgMapper, SysUserOrg> implements ISysUserOrgService {
+ @Autowired
+ private ISysOrganizationService iSysOrganizationService;
/**
* 列表
* @param params
@@ -56,4 +63,26 @@
List<SysUserOrg> sysUserOrg = baseMapper.selectByMap(params);
return sysUserOrg;
}
+ /**
+ 根据用户id ，查询组织
+ */
+ @Override
+ public List<SysOrganization> getListUser(Long userId) {
+ List<SysOrganization> list=new ArrayList<>();
+ Map<String,Object> map=new HashMap<>();
+ map.put("user_id",userId);
+ map.put("is_del",0);
+ map.put("enabled",1);
+ List<SysUserOrg> sysUserOrgs = baseMapper.selectByMap(map);
+ if (!sysUserOrgs.isEmpty()) {
+ //查询组织
+ sysUserOrgs.forEach(e ->{
+ SysOrganization byId = iSysOrganizationService.getById(e.getOrgId());
+ if (byId!=null) {
+ list.add(byId);
+ }
+ });
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0