通知发布修改

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -133,6 +133,6 @@ public class NoticeDTO implements Serializable {
     /**
      * 所有部门列表
      */
-    private List<String> allDeptIdsShow;
+    private List<Long[]> allDeptIdsShow;
 
 }

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

@@ -315,6 +315,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
                 gridIdList.add(deptOptions[NumConstant.THREE]);
             }
         }
+        if (CollUtil.isEmpty(gridIdList)) {
+            throw new RenException("请选择至少一个最低机构部门");
+        }
         return gridIdList;
     }
 

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

@@ -70,8 +70,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-        String noticeTitle= (String) params.get("noticeTitle");
+        String noticeTitle = (String) params.get("noticeTitle");
-        params.put("noticeTitle",noticeTitle.trim());
+        params.put("noticeTitle", noticeTitle.trim());
         QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
                 .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId());
 
@@ -92,7 +92,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     private QueryWrapper<NoticeEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String noticeTitle = ((String) params.get("noticeTitle"));
-        if(StringUtils.isNotBlank(noticeTitle)){
+        if (StringUtils.isNotBlank(noticeTitle)) {
             noticeTitle.trim();
         }
         QueryWrapper<NoticeEntity> wrapper = new QueryWrapper<>();
@@ -105,11 +105,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     public NoticeDTO get(String id) {
         NoticeEntity entity = baseDao.selectById(id);
         NoticeDTO dto = ConvertUtils.sourceToTarget(entity, NoticeDTO.class);
-        if(StringUtils.isNotBlank(dto.getAllDeptIds())){
+        /*if(StringUtils.isNotBlank(dto.getAllDeptIds())){
             String[] idsShow = dto.getAllDeptIds().split(",");
             List<String> ids = Arrays.asList(idsShow);
             dto.setAllDeptIdsShow(ids.subList(1,ids.size()));
-        }
+        }*/
         return dto;
     }
 
@@ -135,49 +135,28 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
      */
     private void saveOrUpdate(NoticeDTO dto) {
         UserDetail user = SecurityUser.getUser();
+        // 通知所属部门（发布者所在部门）
+        Long noticeDeptId = user.getDeptId();
         dto.setCreatorName(user.getRealName());
+
         NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
+        entity.setDeptId(noticeDeptId);
+        entity.setDeptName(user.getDeptName());
 
-        List<String> allDeptIds = dto.getAllDeptIdsShow();
+        // 塞入全部部门ids,names
-        // notice所属部门id
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(noticeDeptId));
-        Long noticeDeptId = 0L;
+        if (!parentResult.success() || parentResult.getData() == null) {
-        if(allDeptIds != null && allDeptIds.size() != 0){
+            throw new RenException("获取用户部门信息失败");
-            // 塞入全部部门ids,names
+        } else {
-            noticeDeptId = Long.valueOf(allDeptIds.get(allDeptIds.size() - 1));
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
-            Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(noticeDeptId));
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
-            if (!parentResult.success() || parentResult.getData() == null) {
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
-                throw new RenException("获取部门信息失败");
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
-            }else {
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
-                ParentAndAllDeptDTO deptDTO = parentResult.getData();
-                entity.setAllDeptIds(deptDTO.getAllDeptIds());
-                entity.setAllDeptNames(deptDTO.getAllDeptNames());
-                entity.setParentDeptIds(deptDTO.getParentDeptIds());
-                entity.setParentDeptNames(deptDTO.getParentDeptNames());
-                //赋值deptid  name 最小组织
-                String[] newAllDeptIds=deptDTO.getAllDeptIds().split(",");
-                entity.setDeptId(Long.parseLong(newAllDeptIds[newAllDeptIds.length-1]));
-
-                String[] newAllDeptNames=deptDTO.getAllDeptNames().split("-");
-                entity.setDeptName(newAllDeptNames[newAllDeptNames.length-1]);
-            }
-        }else {
-            throw new RenException("所属部门不能为空");
-        }
-        if (!user.getDeptIdList().contains(noticeDeptId)) {
-            throw new RenException("您没有操作此部门的数据权限");
-        }
-        List<Long> noticeGridList = new ArrayList<>();
-        if(allDeptIds.size() == 3){
-            noticeGridList.add(noticeDeptId);
-        }
-        if (CollUtil.isEmpty(noticeGridList)) {
-            Result<List<Long>> adminResult = adminFeignClient.listGridIdByDeptPid(noticeDeptId);
-            if (!adminResult.success() || CollUtil.isEmpty(adminResult.getData())) {
-                throw new RenException("获取部门信息失败");
-            }
-            noticeGridList = adminResult.getData();
         }
 
+        List<Long> noticeGridList = getAllGridId(dto.getAllDeptIdsShow());
+
         boolean isSave = true;
         if (StringUtils.isNotBlank(dto.getId())) {
             isSave = false;
@@ -196,6 +175,27 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         this.noticeDepartmentService.save(entity.getId(), noticeGridList);
     }
 
+    /**
+     * 处理前端选中的部门，取出所有网格id
+     *
+     * @param allDeptIdsShow
+     * @return java.util.List<java.lang.Long>
+     * @author work@yujt.net.cn
+     * @date 2020/1/28 16:12
+     */
+    private List<Long> getAllGridId(List<Long[]> allDeptIdsShow) {
+        List<Long> gridIdList = Lists.newArrayList();
+        for (Long[] deptOptions : allDeptIdsShow) {
+            if (deptOptions.length == NumConstant.FOUR) {
+                gridIdList.add(deptOptions[NumConstant.THREE]);
+            }
+        }
+        if (CollUtil.isEmpty(gridIdList)) {
+            throw new RenException("请选择至少一个最低机构部门");
+        }
+        return gridIdList;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -227,7 +227,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     @Override
     public Result<EpdcNoticeDetailResultDTO> getNoticeDetailById(String noticeId) {
         EpdcNoticeDetailResultDTO dto = this.baseDao.selectOneAppNotice(noticeId);
-        dto.setNoticeContent("<div style=\"font-size:19px;line-height:31px\">"+dto.getNoticeContent()+"</div>");
+        dto.setNoticeContent("<div style=\"font-size:19px;line-height:31px\">" + dto.getNoticeContent() + "</div>");
         return new Result().ok(dto);
     }