更新！

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

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

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/PermissSettingListDao.java

@@ -16,4 +16,6 @@ public interface PermissSettingListDao extends MongoDao<PermissSettingList>, Per
     PermissSettingList findTopById(String id);
 
     List<PermissSettingList> findByPermissSettingOrderBySortAsc(PermissSetting permissSetting);
+
+    void deleteByPermissSetting(PermissSetting permissSetting);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/DeviceInfoDaoImpl.java

@@ -86,12 +86,18 @@ public class DeviceInfoDaoImpl extends BaseImpl implements DeviceInfoDaoExtend {
             criteria.and("beLongOid").in(param.getShopOids());
         }
 
+        if (ObjectUtils.isNotEmpty(param.getDeviceIds())) {
+            criteria.and("deviceId").in(param.getDeviceIds());
+        }
+
         // 模糊搜索
         List<Criteria> criterias = new ArrayList<>();
-        if (StringUtils.isNotEmpty(param.getDeviceId())) {
+
+        if (StringUtils.isNotEmpty(param.getDeviceId()) && ObjectUtils.isEmpty(param.getDeviceIds())) {
             Pattern pattern = Pattern.compile("^.*" + param.getDeviceId() + ".*$");
             criterias.add(Criteria.where("deviceId").is(pattern));
         }
+
         if (StringUtils.isNotEmpty(param.getDeviceName())) {
             Pattern pattern = Pattern.compile("^.*" + param.getDeviceName() + ".*$");
             criterias.add(Criteria.where("deviceName").is(pattern));

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

@@ -104,7 +104,7 @@ public class PermissSettingService extends SuperService {
             if (ObjectUtils.isEmpty(entity)) {
                 return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
             }
-            if (ObjectUtils.isNotEmpty(nameTemp) && nameTemp.getId().equals(entity.getId())) {
+            if (ObjectUtils.isNotEmpty(nameTemp) && !nameTemp.getId().equals(entity.getId())) {
                 return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             initUpdateEntity(entity);
@@ -136,16 +136,18 @@ public class PermissSettingService extends SuperService {
         }
         if (ObjectUtils.isNotEmpty(list)) {
             List<PermissSettingList> saveList = new ArrayList<>();
+            long i = 1;
             for (PermissSettingConfigParam param : list) {
                 PermissSettingList permissSettingList = new PermissSettingList();
                 BeanUtils.copyProperties(param, permissSettingList);
                 permissSettingList.setProjectOid(entity.getProjectOid());
                 permissSettingList.setPermissSetting(entity);
-
+                permissSettingList.setSort(i);
                 saveList.add(permissSettingList);
                 if (StringUtils.isNotEmpty(permissSettingList.getId()) && ids.contains(permissSettingList.getId())) {
                     ids.remove(permissSettingList.getId());
                 }
+                i++;
             }
             permissSettingListDao.saveAll(saveList);
         }
@@ -170,6 +172,7 @@ public class PermissSettingService extends SuperService {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
         permissSettingDao.delete(entity);
+        permissSettingListDao.deleteByPermissSetting(entity);
         return ResultContent.buildSuccess();
     }