feat(message): sse-范围

src/main/java/com/dragon/tj/portal/auth/web/service/impl/SysDeptServiceImpl.java

@@ -46,7 +46,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         Set<String> keySet = Sets.newHashSet();
         for (List<String> itemCodes : scopeIdSplit) {
             List<SysUser> sysUsers;
-            if (messageType.equals(BusinessConstants.DICT_ITEM_ID_2)) {
+            if (messageType.equals(BusinessConstants.DICT_ITEM_ID_1)) {
                 sysUsers = sysUserMapper.getUserInfoByOrgIds(itemCodes);
             } else {
                 sysUsers = sysUserMapper.getUserInfoByIds(itemCodes);

src/main/java/com/dragon/tj/portal/service/impl/MessageInfoServiceImpl.java

@@ -172,7 +172,7 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
         Set<String> scopeIds = messageInfoReq.getScopeIds();
         MessageInfoUserInfo messageInfoUserInfo = this.getMessageClientIds(messageType, scopeIds);
 
-        if (Objects.nonNull(messageInfoUserInfo)) {
+        if (CollUtil.isNotEmpty(messageInfoUserInfo.getClientIds())) {
             MessageInfoSend messageInfoSend = this.doSaveMessageInfo(messageInfoReq, messageInfoUserInfo, loginUser);
             isSend = producer.send(KafkaInitialConfiguration.sseTopic, JSON.toJSONString(messageInfoSend));
             if (isSend) {

src/main/resources/mapper/auth/web/SysUserMapper.xml

@@ -36,7 +36,7 @@
         idcard, name, police_number, org_code, org_name, user_type, deleted, update_time, rank, title, man_type, police_category, police_business, sex, birth, nation, address, phone, mobile_work, mobile_private, qq_account, email, wx_account, post_type, job_type
     </sql>
     <select id="getUserInfoByOrgIds" resultType="com.dragon.tj.portal.auth.web.entity.SysUser">
-        select idcard,org_code from sys_user
+        select idcard,org_code,org_name from sys_user
         where org_code in
             <foreach collection="itemCodes" index="index" item="item" open="(" separator="," close=")">
                 #{item}
@@ -44,7 +44,7 @@
     </select>
 
     <select id="getUserInfoByIds" resultType="com.dragon.tj.portal.auth.web.entity.SysUser">
-        select idcard,org_code from sys_user
+        select idcard,org_code,org_name from sys_user
         where idcard in
         <foreach collection="clientIds" index="index" item="item" open="(" separator="," close=")">
             #{item}