用户信息拆分 合并代码处理

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -8,7 +8,9 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
 import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -38,15 +40,17 @@ public class SysMessageService implements ISysMessageService {
     @Autowired
     public SysUserRepository sysUserRDao;
 
+    @Autowired
+    private SysUserInfoRepository userInfoRDao;
+
     @Override
     public SysMessage insertSysMessage(SysMessage sysMessage) {
         // 查询接收人名称
         if (sysMessage.getMessageRecipientId() != null  && sysMessage.getMessageRecipientId() > 0) {
             LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
-            SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId());
-            ValidatorBean.checkNotNull(acceptUser);
+            SysUserInfo userInfo = userInfoRDao.getById(sysMessage.getMessageRecipientId());
 
-            sysMessage.setRedMessageRecipientName(acceptUser.getName());
+            sysMessage.setRedMessageRecipientName(userInfo.getName());
         }
 
         LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);
@@ -65,10 +69,9 @@ public class SysMessageService implements ISysMessageService {
         // 查询接收人名称
         if (sysMessage.getMessageRecipientId() != null  && sysMessage.getMessageRecipientId() > 0) {
             LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
-            SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId());
-            ValidatorBean.checkNotNull(acceptUser);
+            SysUserInfo userInfo = userInfoRDao.getById(sysMessage.getMessageRecipientId());
 
-            sysMessage.setRedMessageRecipientName(acceptUser.getName());
+            sysMessage.setRedMessageRecipientName(userInfo.getName());
         }
 
         LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);