只显示未关联服务端

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -1,8 +1,10 @@
 package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.ServiceInfo;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -52,14 +54,14 @@ public class LantoneProductWrapper extends LantoneProduct {
     /**
      * 关联的service
      */
-    private Long[] services;
+    private List<ServiceInfo> serviceInfos;
 
-    public Long[] getServices() {
-        return services;
+    public List<ServiceInfo> getServiceInfos() {
+        return serviceInfos;
     }
 
-    public void setServices(Long[] services) {
-        this.services = services;
+    public void setServiceInfos(List<ServiceInfo> serviceInfos) {
+        this.serviceInfos = serviceInfos;
     }
 
     public String getServiceIds() {

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

@@ -38,6 +38,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
         qw.eq("name", serviceSaveVO.getName()).
+                eq("user_id", userId).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         ServiceInfo serviceInfo = this.getOne(qw);
         if (serviceInfo != null) {
@@ -117,6 +118,22 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         return list;
     }
 
+    /**
+     * 获取当前登录用户未关联服务列表
+     * @param ids
+     * @return
+     */
+    public List<ServiceInfo> getServiceListNoRelation(Long[] ids) {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
+        qw.eq("user_id", userId).
+                eq("type", ServiceTypeEnum.User_Create.getKey()).
+                eq("is_deleted", "N").
+                notIn("id", ids);
+        List<ServiceInfo> list = this.list(qw);
+        return list;
+    }
+
     /**
      * 获取当前登录用户服务分页列表
      *