新闻上banner功能修改

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsDepartmentService.java

@@ -108,4 +108,14 @@ public interface NewsDepartmentService extends BaseService<NewsDepartmentEntity>
      * @param newsGridList
      */
     void save(String id, List<Long> newsGridList);
+
+    /**
+     * 获取新闻部门ID列表
+     *
+     * @param newsId
+     * @return java.util.List<java.lang.Long>
+     * @author work@yujt.net.cn
+     * @date 2019/9/18 20:12
+     */
+    List<Long> listNewsDeptId(String newsId);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsDepartmentServiceImpl.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.NewsDepartmentDTO;
 import com.elink.esua.epdc.entity.NewsDepartmentEntity;
 import com.elink.esua.epdc.redis.NewsDepartmentRedis;
 import com.elink.esua.epdc.service.NewsDepartmentService;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -126,4 +127,18 @@ public class NewsDepartmentServiceImpl extends BaseServiceImpl<NewsDepartmentDao
         this.insertBatch(list, NumConstant.TWENTY);
     }
 
+    @Override
+    public List<Long> listNewsDeptId(String newsId) {
+        QueryWrapper<NewsDepartmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("NEWS_ID", newsId);
+        List<NewsDepartmentEntity> newsDepartmentEntities = this.baseDao.selectList(wrapper);
+
+        List<Long> result = Lists.newArrayList();
+        if(CollUtil.isNotEmpty(newsDepartmentEntities)){
+            for (NewsDepartmentEntity newsDepartmentEntity : newsDepartmentEntities) {
+                result.add(newsDepartmentEntity.getDeptId());
+            }
+        }
+        return result;
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -243,7 +243,6 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
                     throw new RenException("获取部门信息失败");
                 }
                 newsGridList = adminResult.getData();
-            } else {
             }
             if (isSave) {
                 insert(entity);
@@ -379,11 +378,10 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
             return new Result().error("操作失败，新闻不存在或已是banner");
         }
 
-        Result<List<Long>> adminResult = adminFeignClient.listGridIdByDeptPid(SecurityUser.getDeptId());
-        if (!adminResult.success() || CollUtil.isEmpty(adminResult.getData())) {
+        List<Long> deptIds = newsDepartmentService.listNewsDeptId(newsId);
+        if (CollUtil.isEmpty(deptIds)) {
             throw new RenException("获取部门信息失败");
         }
-        List<Long> deptIds = adminResult.getData();
 
         BannerDTO banner = ConvertUtils.sourceToTarget(newsEntity, BannerDTO.class);
         banner.setState(YesOrNoEnum.YES.value());