通知 数据权限 deptid deptname存取

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

@@ -70,7 +70,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-
+        String noticeTitle= (String) params.get("noticeTitle");
+        params.put("noticeTitle",noticeTitle.trim());
         QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
                 .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId());
 
@@ -135,8 +136,6 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     private void saveOrUpdate(NoticeDTO dto) {
         UserDetail user = SecurityUser.getUser();
         dto.setCreatorName(user.getRealName());
-        dto.setDeptId(user.getDeptId());
-        dto.setDeptName(user.getDeptName());
         NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
 
         List<String> allDeptIds = dto.getAllDeptIdsShow();
@@ -154,6 +153,12 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 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("所属部门不能为空");

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -49,7 +49,9 @@
             parent_dept_ids = #{parentDeptIds},
             parent_dept_names = #{parentDeptNames},
             updated_by = #{updatedBy},
-            updated_time = #{updatedTime}
+            updated_time = #{updatedTime},
+            dept_id=#{deptId},
+            dept_name=#{deptName}
         WHERE id = #{id} AND del_flag = '0'
     </update>
 </mapper>