add

添加租户字段
fix
修复deleted字段没有默认值

tr-framework/src/main/java/cn/tr/core/constant/MybatisConstant.java

@@ -34,4 +34,9 @@ public class MybatisConstant {
      * 分页信息缓存
      */
     public static final String PAGE_CACHE = "page_cache";
+
+    /**
+     * 删除
+     */
+    public static final String DELETED = "deleted";
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizDeptPO.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @TableName(value="biz_dept",autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 @ToString
-public class BizDeptPO extends BasePO {
+public class BizDeptPO extends TenantPO {
 
 
     /** id */

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizDocDeptPO.java

@@ -2,6 +2,7 @@ package cn.tr.module.smart.common.po;
 
 
 import cn.tr.plugin.mybatis.pojo.BasePO;
+import cn.tr.plugin.mybatis.pojo.TenantPO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +20,7 @@ import java.util.*;
 @TableName(value="biz_doc_dept",autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 @ToString
-public class BizDocDeptPO extends BasePO {
+public class BizDocDeptPO extends TenantPO {
 
     /** id */
     @TableId

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizMissionDocPO.java

@@ -65,10 +65,6 @@ public class BizMissionDocPO extends TenantPO {
     @ApiModelProperty(value = "间隔时间段（最大值）,如术后2-6天，即6", position = 10)
     private Integer intervalMaxDay;
 
-    /** 医院id（医院上传的自己的文档） */
-    @ApiModelProperty(value = "医院id（医院上传的自己的文档）", position = 11)
-    private String tenantId;
-
     /** 版本号 */
     @ApiModelProperty(value = "版本号", position = 16)
     private Integer version;
@@ -85,10 +81,7 @@ public class BizMissionDocPO extends TenantPO {
     @ApiModelProperty(value = "宣教光广场ID", position = 19)
     private String squareDocId;
 
-    @Comment("删除标记")
-    @ColumnDefaultValue("0")
     @TableLogic
-    @TableField(jdbcType = JdbcType.TINYINT)
-    private Boolean deleted;
+    private Integer deleted;
 
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizMissionDocSquarePO.java

@@ -90,9 +90,6 @@ public class BizMissionDocSquarePO extends TenantPO {
     @ApiModelProperty(value = "md5", position = 16)
     private String contentMd5;
 
-    @Comment("删除标记")
-    @ColumnDefaultValue("0")
     @TableLogic
-    @TableField(jdbcType = JdbcType.TINYINT)
-    private Boolean deleted;
+    private Integer deleted;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizQuestionPO.java

@@ -3,6 +3,7 @@ package cn.tr.module.smart.common.po;
 
 import cn.tr.plugin.mybatis.config.handler.StringListTypeHandler;
 import cn.tr.plugin.mybatis.pojo.BasePO;
+import cn.tr.plugin.mybatis.pojo.TenantPO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,7 +24,7 @@ import java.util.List;
 @TableName(value="biz_question",autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 @ToString
-public class BizQuestionPO extends BasePO {
+public class BizQuestionPO extends TenantPO {
 
     /** id */
     @TableId

tr-plugins/tr-spring-boot-starter-plugin-biz-tenant/src/main/java/cn/tr/plugin/biz/tenant/config/db/TenantCreateAndUpdateMetaObjectHandler.java

@@ -31,9 +31,11 @@ public class TenantCreateAndUpdateMetaObjectHandler implements MetaObjectHandler
                 this.strictInsertFill(metaObject, MybatisConstant.CREATE_BY, String.class,localUserId);
             }
             if (metaObject.hasGetter(MybatisConstant.TENANT_ID) && metaObject.getValue(MybatisConstant.TENANT_ID) == null) {
-
                 this.strictInsertFill(metaObject, MybatisConstant.TENANT_ID, String.class,tenantId);
             }
+            if (metaObject.hasGetter(MybatisConstant.DELETED) && metaObject.getValue(MybatisConstant.DELETED) == null) {
+                this.strictInsertFill(metaObject, MybatisConstant.DELETED, Integer.class,0);
+            }
             updateFill(metaObject);
         } catch (Exception e) {
             e.printStackTrace();

tr-plugins/tr-spring-boot-starter-plugin-mybatis/src/main/java/cn/tr/plugin/mybatis/config/handler/CreateAndUpdateMetaObjectHandler.java

@@ -27,6 +27,9 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 
                 this.strictInsertFill(metaObject, MybatisConstant.CREATE_BY, String.class,localUserId);
             }
+            if (metaObject.hasGetter(MybatisConstant.DELETED) && metaObject.getValue(MybatisConstant.DELETED) == null) {
+                this.strictInsertFill(metaObject, MybatisConstant.DELETED, Integer.class,0);
+            }
             updateFill(metaObject);
         } catch (Exception e) {
             e.printStackTrace();

tr-test/src/main/resources/application.yml

@@ -8,7 +8,7 @@ server:
 mybatis-plus:
   mapper-locations: classpath*:com/gitee/sunchenbin/mybatis/actable/mapping/*/*.xml,classpath*:mapper/*/*.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       logic-delete-value: 1