Merge branch 'feat-20230717-articledelflag'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmWkAlbumController.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEntDrugtable;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntDrugtableService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -80,6 +81,7 @@ public class WmWkAlbumController {
 			queryWrapper.apply(true,"FIND_IN_SET ("+wmWkAlbum.getGlyp()+",glyp)");
 		}
 
+		queryWrapper.eq("del_flag", DelEnum.NOT_DEL.val());
 		queryWrapper.orderByDesc("create_time");
 
     	Page pageAnswer =wmWkAlbumService.page(page, queryWrapper);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmWkArticleController.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.entity.WmWkArticle;
@@ -91,6 +92,7 @@ public class WmWkArticleController {
 			wrappers.eq(true, "source", wmWkArticle.getSource());
 		}
 
+		wrappers.eq("del_flag", DelEnum.NOT_DEL.val());
 		wrappers.orderByDesc("create_time");
 
 		return R.ok(wmWkArticleService.page(page, wrappers));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmWkAlbum.java

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
@@ -81,6 +82,7 @@ private static final long serialVersionUID = 1L;
     /**
      * 是否删除
      */
+    @TableLogic
     @ApiModelProperty(value="是否删除")
     private Integer delFlag;
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmWkArticle.java

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
@@ -95,6 +96,7 @@ public class WmWkArticle extends Model<WmWkArticle> {
 	/**
 	 * 是否删除
 	 */
+	@TableLogic
 	@ApiModelProperty(value = "是否删除")
 	private Integer delFlag;
 	/**