--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/recycleBin/RecycleBinResource.java

@@ -17,6 +17,8 @@ public class RecycleBinResource {
 	@Id
 	@ApiModelProperty("关联表id")
 	private String id;
+	@ApiModelProperty("回收站id")
+	private String rlId;
 	@ApiModelProperty("关联id")
 	private String objectId;
 	@ApiModelProperty("资源id")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/RecycleBinSerivceImpl.java

@@ -680,6 +680,8 @@ public class RecycleBinSerivceImpl extends BaseServiceImpl<RecycleBin,Integer> i
 		obj.setRlId(bin.getId());
 		list.add(obj);
 		diyTypeMapper.insertUuidList(list);
+		res.setObjectId(form.getObjectId());
+		res.setRlId(bin.getId());
 		listRes.add(res);
 		resourceMapper.insertUuidList(listRes);
 	}
@@ -692,11 +694,16 @@ public class RecycleBinSerivceImpl extends BaseServiceImpl<RecycleBin,Integer> i
 		List<RecycleBin> list = mapper.selectByExample(example);
 		for (RecycleBin bin : list) {
 			deleteResource(bin,"1");
+			//还需删除与自定义分类关系
+			RecycleBinDiyType type=new RecycleBinDiyType();
+			type.setRlId(bin.getId());
+			diyTypeMapper.delete(type);
+			//删除关联资源
+			RecycleBinResource res=new RecycleBinResource();
+			res.setRlId(bin.getId());
+			resourceMapper.delete(res);
 		}
 		mapper.deleteByExample(example);
-		//还需删除与自定义分类关系
-		createCriteria(RecycleBinDiyType.class).andIn("rlId", ids);
-		diyTypeMapper.deleteByExample(example);
 		return true;
 	}
 	public boolean batchDeleteAll() {
@@ -732,6 +739,9 @@ public class RecycleBinSerivceImpl extends BaseServiceImpl<RecycleBin,Integer> i
 			RecycleBinDiyType type=new RecycleBinDiyType();
 			type.setRlId(bin.getId());
 			diyTypeMapper.delete(type);
+			RecycleBinResource res=new RecycleBinResource();
+			res.setRlId(bin.getId());
+			resourceMapper.delete(res);
 		}
 		mapper.deleteByExample(example);
 		return false;