协议授权取消批量

commons/src/main/java/com/jzg/commons/entity/dto/AgreementAuthParam.java

@@ -11,9 +11,9 @@ import java.util.List;
 @Data
 public class AgreementAuthParam {
 
-    @NotNull(message = "协议id数组不能为空")
-    @Schema(description = "协议id数组")
-    private List<String> ids;
+    @NotNull(message = "协议id不能为空")
+    @Schema(description = "协议id")
+    private String id;
 
     @NotEmpty(message = "机构id不能为空")
     @Schema(description = "机构id数组")

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementDeptServiceImpl.java

@@ -95,17 +95,15 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
     public void authSave(AgreementAuthParam param) {
         // 删除之前所有的授权id
         LambdaQueryWrapper<PtlAgreementDept> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(PtlAgreementDept::getAgreementId, param.getIds());
+        wrapper.in(PtlAgreementDept::getAgreementId, param.getId());
         this.remove(wrapper);
 
         // 新增保存授权数据
         List<String> deptIds = param.getDeptIds();
         List<PtlAgreementDept> agreementDepts = new ArrayList<>();
         deptIds.forEach(deptId->{
-            param.getIds().forEach(id ->{
-                PtlAgreementDept dept = new PtlAgreementDept(id,deptId);
-                agreementDepts.add(dept);
-            });
+            PtlAgreementDept dept = new PtlAgreementDept(param.getId(),deptId);
+            agreementDepts.add(dept);
         });
         this.saveBatch(agreementDepts);
     }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -127,6 +127,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         long count = this.count(new LambdaQueryWrapper<PtlAgreement>()
                 .eq(PtlAgreement::getAgreementTitle, agreementTitle)
                 .ne(StringUtils.isNotNull(id),PtlAgreement::getId, id)
+                .eq(PtlAgreement::getIsDelete,0)
         );
         return count > 0;
     }