排查修改

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -237,7 +237,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
     @Override
     public PageRecord<EventListDTO> queryEventByPage(EventListParams request) {
         Integer pageNo = Optional.ofNullable(request.getPageNo()).orElse(1);
-        Integer pageSize = Optional.ofNullable(request.getPageNo()).orElse(10);
+        Integer pageSize = Optional.ofNullable(request.getPageSize()).orElse(10);
 
         // 执行分页查询
         Page<EventList> eventPage = eventService.queryEventListByDevId(request.getDevId(),

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/GroupGatewayImpl.java

@@ -83,7 +83,7 @@ public class GroupGatewayImpl implements GroupGateway {
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteGroup(Long groupId) {
         //TODO  MQTT消息  主题 /mps/delete_group
         //1.查询群组信息

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -541,10 +541,10 @@ public class UserGatewayImpl implements UserGateway {
 
         UserInfo userInfo = null;
         if (StringUtils.isNotBlank(params.getOpenId())) {
-
+            userInfo = userService.queryByOpenId(params.getOpenId());
         } else if (StringUtils.isNotBlank(params.getPhone())) {
             userInfo = userService.queryByPhone(params.getPhone());
-        } else if (params.getUserId() == null) {
+        } else if (params.getUserId() != null) {
             userInfo = userService.queryById(params.getUserId());
         }