Browse Source

Merge remote-tracking branch 'origin/dev/one' into dev/one

zhoutg 6 years ago
parent
commit
da46971ea1

+ 11 - 0
diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -284,6 +284,17 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
                 rlist.data.add(-1L);
             }
             openedProductsIndex.setUserId(rlist.data);
+        }else{
+            RespDTO<List<User>> userInfiList = userServiceClient.getUserAllInfo();
+            if(userInfiList == null || !"0".equals(userInfiList.code) ) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取用户和机构信息失败");
+            }
+            List<Long> userIds =new ArrayList<>();
+            for (User user:userInfiList.data) {
+                userIds.add(user.getId());
+            }
+            openedProductsIndex.setUserId(userIds);
         }
         List<OpendProductDTO> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
         List<Long> list1 = new ArrayList<>();