Browse Source

令牌只显示手动生成的

Zhaops 6 years ago
parent
commit
243ecab92f

+ 5 - 2
diagbotman-service/src/main/resources/mapper/ProductServiceMapper.xml

@@ -37,15 +37,18 @@
     <!-- 查询产品与服务端的关联列表(分页) -->
     <select id="selectProductServicePage" resultMap="BaseResultWrapperMap">
         select a.*,d.name as product_name,d.decription as product_description,c.name as service_name,c.description as service_description
-        from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
+        from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d,diag_service_token e
         where a.product_id=b.product_id
         and a.product_id=d.id
         and a.service_id=c.id
+        and a.id=e.product_service_id
         and a.is_deleted='N'
         and b.is_deleted='N'
         and c.is_deleted='N'
-        and b.service_status=1
         and d.is_deleted='N'
+        and e.is_deleted='N'
+        and b.service_status=1
+        and e.type=2
         and (find_in_set('1',d.access_type) or FIND_IN_SET('2',d.access_type))
         <if test="productService.userId != null and productService.userId != '' ">
             and b.user_id=#{productService.userId} and c.user_id=#{productService.userId}