更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoSearch.java

@@ -22,6 +22,7 @@ public class DeviceInfoSearch extends SuperSearch {
     @Schema(description = "设备ID")
     private String deviceId;
 
+    @Schema(description = "设备deviceId集合")
     private List<String> deviceIds = new ArrayList<>();
 
     @Schema(description = "设备名称")

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/PermissSettingConfigModel.java

@@ -21,6 +21,8 @@ import java.util.List;
 @NoArgsConstructor
 public class PermissSettingConfigModel {
 
+    private String id;
+
     @Schema(description = "设备配置类型")
     private PermissSettingType permissSettingType;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationRelationSearch.java

@@ -4,6 +4,9 @@ import com.zhongshu.card.client.type.OrganizationRelationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author TRX
  * @date 2024/6/11
@@ -34,4 +37,6 @@ public class OrganizationRelationSearch {
 
     @Schema(description = "绑定关联类型")
     private OrganizationRelationType relationType;
+
+    private List<String> oids = new ArrayList<>();
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationRelationDaoImpl.java

@@ -6,6 +6,7 @@ import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.org.extend.OrganizationRelationDaoExtend;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -54,6 +55,9 @@ public class OrganizationRelationDaoImpl extends BaseImpl implements Organizatio
         if (StringUtils.isNotEmpty(param.getRelOid())) {
             criteria.and("relOid").is(param.getRelOid());
         }
+        if (StringUtils.isEmpty(param.getRelOid()) && ObjectUtils.isNotEmpty(param.getOids())) {
+            criteria.and("relOid").in(param.getOids());
+        }
 
         // 绑定类型
         if (param.getRelationType() != null) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/PermissSettingService.java

@@ -138,6 +138,13 @@ public class PermissSettingService extends SuperService {
             List<PermissSettingList> saveList = new ArrayList<>();
             long i = 1;
             for (PermissSettingConfigParam param : list) {
+
+                if (StringUtils.isNotEmpty(param.getId())) {
+                    PermissSettingList temp = permissSettingListDao.findTopById(param.getId());
+                    if (ObjectUtils.isEmpty(temp)) {
+                        param.setId(null);
+                    }
+                }
                 PermissSettingList permissSettingList = new PermissSettingList();
                 BeanUtils.copyProperties(param, permissSettingList);
                 permissSettingList.setProjectOid(entity.getProjectOid());