|
@@ -115,18 +115,17 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public String getUserInfo(String code,String orgId) {
|
|
|
+ public String getUserInfo(String code) {
|
|
|
WeChatUser userInfo = PushUtil.getUserInfo(code);
|
|
|
log.info("获取用户信息……:{}", userInfo.getOpenid());
|
|
|
if(ObjectUtil.isEmpty(userInfo)) {
|
|
|
throw new CommonException("获取用户信息失败");
|
|
|
}
|
|
|
- List<AlarmUser> userList = getByOpenId(userInfo.getOpenid(),orgId);
|
|
|
+ List<AlarmUser> userList = getByOpenId(userInfo.getOpenid());
|
|
|
AlarmUser alarmUser = BeanUtil.copyProperties(userInfo, AlarmUser.class);
|
|
|
alarmUser.setOpenId(userInfo.getOpenid());
|
|
|
alarmUser.setUnionId(userInfo.getUnionid());
|
|
|
alarmUser.setNickName(userInfo.getNickname());
|
|
|
- alarmUser.setCreateOrg(orgId);
|
|
|
if (!userList.isEmpty()) {
|
|
|
for (AlarmUser user : userList) {
|
|
|
alarmUser.setId(user.getId());
|
|
@@ -139,9 +138,9 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- List<AlarmUser> getByOpenId(String openId,String orgId) {
|
|
|
+ List<AlarmUser> getByOpenId(String openId) {
|
|
|
LambdaQueryWrapper<AlarmUser> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(AlarmUser::getOpenId, openId).eq(AlarmUser::getCreateOrg, orgId)
|
|
|
+ queryWrapper.eq(AlarmUser::getOpenId, openId)
|
|
|
.eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
return list(queryWrapper);
|
|
|
}
|