:zap: 优化代码

blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseEntity.java

@@ -18,6 +18,7 @@ package org.springblade.core.mp.base;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -78,6 +79,7 @@ public class BaseEntity implements Serializable {
 	/**
 	 * 状态[0:未删除,1:删除]
 	 */
+	@TableLogic
 	@ApiModelProperty(value = "是否已删除")
 	private Integer isDeleted;
 }

blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseServiceImpl.java

@@ -15,8 +15,8 @@
  */
 package org.springblade.core.mp.base;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -75,10 +75,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
 		T entity = BeanUtil.newInstance(modelClass);
 		entity.setUpdateUser(user.getUserId());
 		entity.setUpdateTime(LocalDateTime.now());
-		entity.setIsDeleted(BladeConstant.DB_IS_DELETED);
-		UpdateWrapper<T> uw = new UpdateWrapper<>();
-		uw.in(BladeConstant.DB_PRIMARY_KEY, ids);
-		return super.update(entity, uw);
+		return super.update(entity, Wrappers.<T>update().lambda().in(T::getId, ids)) && super.removeByIds(ids);
 	}
 
 }

blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java

@@ -18,7 +18,6 @@ package org.springblade.core.mp.support;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
@@ -76,7 +75,6 @@ public class Condition {
 				}
 			});
 		}
-		qw.eq(BladeConstant.IS_DELETED_FIELD, BladeConstant.DB_NOT_DELETED);
 		return qw;
 	}