feat(bucket):优化编辑逻辑;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java

@@ -343,8 +343,12 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         LambdaQueryWrapper<RecycleBucketEntity> wrapper = new LambdaQueryWrapper<>(RecycleBucketEntity.class)
                 .eq(RecycleBucketEntity::getDeviceCode, recycleBucketForm.getDeviceCode())
                 .isNull(RecycleBucketEntity::getDeleteMark);
+        //编辑的话 排除自己
+        if (!isSave) {
+            wrapper.ne(RecycleBucketEntity::getId, recycleBucketForm.getId());
+        }
         List<RecycleBucketEntity> list = this.list(wrapper);
-        if (list.size() >= 2) {
+        if ((isSave && list.size() >= 2) || (!isSave && list.size() > 1)) {
             return "该设备已存在两台回收桶!";
         }
         if (isSave) {

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java

@@ -148,7 +148,7 @@ public class RecycleBucketController {
                 //只会查询出来一个
                 recycleBucketForm.setCompanyId(companyId.get(0));
             }
-            String result = recycleBucketService.saveOrUpdate(recycleBucketForm, null, true);
+            String result = recycleBucketService.saveOrUpdate(recycleBucketForm, null, false);
             if (result.contains("失败") || result.contains("该设备已存在两台回收桶")) {
                 return ActionResult.fail(result);
             }