From 05764fb1631a8d9bf37f07d6fb0d92d8884b1406 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 27 Sep 2023 15:11:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BD=BF@Translation=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/SysDictItemServiceImpl.java  |  5 +++--
 .../modules/laws/standard/entity/LawsNewsFeed.java   |  1 +
 .../service/impl/LawsNewsFeedServiceImpl.java        | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
index d8b1a65c..be194ef1 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
@@ -36,8 +36,9 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
 
     @Override
     public List<SysDictItem> getDictItemAll() {
-//        return sysDictItemMapper.getDictItemAll();
-        return null;
+        //return sysDictItemMapper.getDictItemAll();
+        return sysDictItemMapper.selectItemsAll();
+        //return null;
     }
     /**
      * 查询所有数据字典信息
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
index c8a3870a..130d8c02 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
@@ -108,6 +108,7 @@ public class LawsNewsFeed implements Serializable {
 
     @ApiModelProperty(value = "推送范围")
     @TableField(exist = false)
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no")
     private String pushRange;
 
     @ApiModelProperty(value = "是否可以编辑和删除")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
index cf1cfbaf..5227d098 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
@@ -11,7 +11,9 @@ import com.jero.modules.laws.standard.entity.LawsPushRange;
 import com.jero.modules.laws.standard.mapper.LawsNewsFeedMapper;
 import com.jero.modules.laws.standard.service.ILawsNewsFeedService;
 import com.jero.modules.laws.standard.service.ILawsPushRangeService;
+import com.jero.modules.system.entity.SysUser;
 import com.spire.ms.System.Collections.ArrayList;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -218,6 +220,16 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
 			lawsNewsFeed.setReadCount(lawsNewsFeed.getReadCount() + 1);
 			updateById(lawsNewsFeed);
 		}
+		// 如果是指定用户推送
+		if (1 == lawsNewsFeed.getPushRangeFlag()) {
+			LambdaQueryWrapper<LawsPushRange> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(LawsPushRange::getUniqueRelationFlag, id);
+			List<LawsPushRange> pushRangeList = lawsPushRangeService.list(queryWrapper);
+			if (CollectionUtils.isNotEmpty(pushRangeList)) {
+				List<String> userIdList = pushRangeList.stream().map(LawsPushRange::getUserId).collect(Collectors.toList());
+				lawsNewsFeed.setPushRange(StringUtils.join(userIdList, ","));
+			}
+		}
         return lawsNewsFeed;
     }
 }