|
|
@@ -17,6 +17,7 @@ import java.util.StringJoiner;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import com.ym.mec.biz.dal.entity.TenantInfo;
|
|
|
+import com.ym.mec.biz.service.TenantInfoService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -44,7 +45,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
@Autowired
|
|
|
private OrganizationDao organizationDao;
|
|
|
@Autowired
|
|
|
- private TenantInfoDao tenantInfoDao;
|
|
|
+ private TenantInfoService tenantInfoService;
|
|
|
@Autowired
|
|
|
private TeacherDao teacherDao;
|
|
|
@Autowired
|
|
|
@@ -248,7 +249,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
public String getEmployeeOrgan(Integer userId, String organIds,Boolean isSuper) {
|
|
|
if(StringUtils.isEmpty(organIds)){
|
|
|
Integer tenantId = TenantContextHolder.getTenantId();
|
|
|
- TenantInfo tenantInfo = tenantInfoDao.selectById(tenantId);
|
|
|
+ TenantInfo tenantInfo = tenantInfoService.get(tenantId);
|
|
|
//如果是超管，或者是机构管理员，可以查看当前机构所有分部数据
|
|
|
if(isSuper || (tenantInfo.getUserId() != null && tenantInfo.getUserId().equals(userId))){
|
|
|
Map<String,Object> param = new HashMap<>();
|
hgw