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

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

@@ -134,10 +134,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return 根据用户id查询是否有开通产品
      */
     public RespDTO<IPage<LantoneProduct>> productLine(Page page) {
-        /*Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());*/
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         IPage<LantoneProduct> diagLantoneProducts =null;
         String name =null;
-        List<Long> list = openedProductsFacade.getOpendCountByUserId(1L);
+        List<Long> list = openedProductsFacade.getOpendCountByUserId(userId);
         if(list.size()!=0){
             diagLantoneProducts=this.productLine(page,list);
             return RespDTO.onSuc(diagLantoneProducts);