From 518d91fb84fc0fcf3bb95c9886dacf121f5e1b4b Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Tue, 23 Jun 2020 10:11:19 +0800 Subject: [PATCH] 修改获取数据需求的接口 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java index e079c83..d41f640 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java @@ -1,23 +1,24 @@ package com.kidgrow.oprationcenter.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.model.PageResult; import com.kidgrow.common.model.ResultBody; +import com.kidgrow.common.model.SysDoctor; import com.kidgrow.common.model.SysUser; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.oprationcenter.mapper.DataNeedMapper; import com.kidgrow.oprationcenter.model.DataNeed; import com.kidgrow.oprationcenter.service.IDataNeedService; import com.kidgrow.oprationcenter.vo.DataNeedExcel; +import com.kidgrow.usercenter.feign.SysDoctorService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanCopier; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -30,6 +31,8 @@ @Slf4j @Service public class DataNeedServiceImpl extends SuperServiceImpl<DataNeedMapper, DataNeed> implements IDataNeedService { + @Autowired + private SysDoctorService sysDoctorService; /** * 列表 * @param params @@ -105,13 +108,15 @@ @Override public ResultBody FindAllByHId(Map<String, Object> map, SysUser sysUser) { - if (sysUser != null&&sysUser.isHAdminUser()) { - List<DataNeed> dataNeedList=baseMapper.findHList(map); - return ResultBody.ok().data(dataNeedList); - } - else - { - return ResultBody.failed("非管理用户无权查看"); - } + Map<String,Object> doctoerMap =new HashMap<>(); + doctoerMap.put("user_id",sysUser.getId()); + ResultBody listByMap = sysDoctorService.getListByMap(doctoerMap); + List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class); + if (sysDoctors!=null&&sysDoctors.size()>0){ + List<DataNeed> dataNeedList=baseMapper.findHList(map); + return ResultBody.ok().data(dataNeedList); + }else { + return ResultBody.failed("非管理用户无权查看"); + } } } -- Gitblit v1.8.0