BUG修复

blade-service/blade-business/src/main/java/org/springblade/business/controller/RecycleBinController.java

@@ -129,6 +129,10 @@ public class RecycleBinController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页")
 	public R<IPage<RecycleBin>> list(RecycleBin recycleBin, Query query) {
+		//是否是全部
+		boolean isAll = StringUtils.isNotEmpty(recycleBin.getCreateUserName()) && "ALL".equals(recycleBin.getCreateUserName());
+		recycleBin.setCreateUserName(null);
+
 		QueryWrapper<RecycleBin> wrapper = Condition.getQueryWrapper(recycleBin);
 
 		//获取当前时间
@@ -137,7 +141,7 @@ public class RecycleBinController extends BladeController {
 		Date oldDate = DateUtil.minusDays(nowDate, 30);
 
 		wrapper.lambda().between(RecycleBin::getCreateTime, oldDate, nowDate);
-		if(StringUtils.isNotEmpty(recycleBin.getCreateUserName()) && "ALL".equals(recycleBin.getCreateUserName())){
+		if(isAll){
 			wrapper.lambda().eq(RecycleBin::getContractId, recycleBin.getContractId().toString());
 		} else {
 			wrapper.lambda().eq(RecycleBin::getCreateUser, AuthUtil.getUserId());