|
@@ -257,7 +257,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
mceRequestVO.setInfoTypeName(infoTypeName);
|
|
|
}
|
|
|
|
|
|
- Integer tenantId = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, mceRequestVO.getUserName()).select(SysUser::getTenantId)).getTenantId();
|
|
|
+ Integer tenantId = null;
|
|
|
+ try {
|
|
|
+ tenantId = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, mceRequestVO.getUserName()).select(SysUser::getTenantId)).getTenantId();
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("获取用户租户ID失败,报错信息:{}, 未找到用户-{}-的租户",e.getMessage(), mceRequestVO.getUserName());
|
|
|
+ }
|
|
|
|
|
|
// 获取当前租户的所有用户
|
|
|
List<SysUser> userList = userMapper.tenantIdUserList(tenantId);
|
|
@@ -494,7 +499,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
mceReceiveVO.put("infoTypeName", infoTypeName);
|
|
|
}
|
|
|
|
|
|
- Integer tenantId = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, mceReceiveVO.get("userName")).select(SysUser::getTenantId)).getTenantId();
|
|
|
+ Integer tenantId = null;
|
|
|
+ try {
|
|
|
+ tenantId = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, mceReceiveVO.get("userName")).select(SysUser::getTenantId)).getTenantId();
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("获取用户租户ID失败,报错信息:{}, 未找到用户-{}-的租户",e.getMessage(), mceReceiveVO.get("userName"));
|
|
|
+ }
|
|
|
List<SysUser> list = userMapper.tenantIdUserList(tenantId);
|
|
|
// 获取用户昵称与真实姓名Map
|
|
|
Map<String, String> userNameNickNameMap = list.stream().collect(Collectors.toMap(SysUser::getUserName, SysUser::getNickName));
|
|
@@ -642,4 +652,29 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
|
|
|
return new CommonPage<>(returnList, page.getTotal(), page.getSize(), page.getCurrent());
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增消息-无需token
|
|
|
+ * @param mceNoToken
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public void addNoToken(String mceNoToken) {
|
|
|
+ JSONObject json = JSONObject.parseObject(mceNoToken);
|
|
|
+ List<String> userNames = JSONObject.parseArray(json.get("userNames").toString(), String.class);
|
|
|
+
|
|
|
+ LambdaQueryWrapper<SysUser> lambdaQuery = Wrappers.lambdaQuery();
|
|
|
+ lambdaQuery.select(SysUser::getUserId)
|
|
|
+ .in(SysUser::getUserName, userNames);
|
|
|
+ List<Long> userIdList = userMapper.selectList(lambdaQuery).stream().map(SysUser::getUserId).collect(Collectors.toList());
|
|
|
+
|
|
|
+ MceRequestVO mceRequestVO = new MceRequestVO();
|
|
|
+ mceRequestVO.setUserIds(userIdList);
|
|
|
+ mceRequestVO.setInfoTitle(json.get("infoTitle").toString());
|
|
|
+ mceRequestVO.setInfoContent(json.get("infoContent").toString());
|
|
|
+ mceRequestVO.setInfoType(json.get("infoType").toString());
|
|
|
+ mceRequestVO.setInfoTypeName(json.get("infoTypeName").toString());
|
|
|
+ mceRequestVO.setId((Integer) json.get("id"));
|
|
|
+ mceRequestVO.setUserName(json.get("userName").toString());
|
|
|
+ addMceReceive(mceRequestVO);
|
|
|
+ }
|
|
|
}
|