租户ID统一存储最上层工厂级部门ID处理

bs-common/pom.xml

@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>safe-produce</artifactId>
+        <groupId>com.rongwei</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bs-common</artifactId>
+    <packaging>jar</packaging>
+
+    <name>bs-common</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>rw-admin-common</artifactId>
+            <version>1.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

bs-common/src/main/java/com/rongwei/safecommon/config/BsMetaObjectHandler.java

@@ -0,0 +1,155 @@
+package com.rongwei.safecommon.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.rongwei.commonservice.service.RedisService;
+import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.utils.StringUtils;
+import org.apache.ibatis.reflection.MetaObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class BsMetaObjectHandler implements MetaObjectHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(BsMetaObjectHandler.class);
+
+    @Autowired
+    private RedisService redisService;
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try{
+            System.out.println("insert 拦截...");
+            SysUserVo sysUser = null;
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if(attributes == null){
+                sysUser = new SysUserVo();
+                sysUser.setId("0");
+                sysUser.setName("系统操作");
+            }else{
+                HttpServletRequest request = attributes.getRequest();
+                if(request == null){
+                    sysUser = new SysUserVo();
+                    sysUser.setId("0");
+                    sysUser.setName("系统操作");
+                }else{
+                    String token = request.getHeader("token");
+                    logger.info("token.... "+token);
+                    if(token == null || "".equals(token)){
+                        sysUser = new SysUserVo();
+                        sysUser.setId("0");
+                        sysUser.setName("系统操作");
+                    }else{
+                        sysUser = redisService.getLoginUser(token);
+                        if(sysUser == null){
+                            logger.info("当前token未查到对应的用户信息");
+                            sysUser = new SysUserVo();
+                        }
+                    }
+                }
+            }
+
+            logger.info("start insert fill ....");
+            Object tenantid = this.getFieldValByName("tenantid", metaObject);
+            if(null == tenantid && sysUser != null){
+                // 获取最上层部门
+                List<SysOrganizationVo> organizationDoList = sysUser.getOrganizationDoList();
+                if(organizationDoList != null && organizationDoList.size()>0){
+                    SysOrganizationVo org = organizationDoList.get(0);
+                    String fullpid = org.getFullpid();
+                    String tid = null;
+                    if(StringUtils.isNotBlank(fullpid)){
+                        String[] fullpids = fullpid.split(",");
+                        for (String pid : fullpids) {
+                            if(StringUtils.isNotBlank(pid)){
+                                tid = pid;
+                                break;
+                            }
+                        }
+                    }
+                    this.setFieldValByName("tenantid", tid, metaObject);
+                }
+            }
+
+            Date now = new Date();
+
+            Object createDate = this.getFieldValByName("createdate", metaObject);
+            if(null == createDate){
+                /**
+                 * 设置实体属性setter进去的值，优先级要高于自动填充的值。
+                 * 如果实体没有设置该属性，就给默认值，防止entity的setter值被覆盖。
+                 */
+                this.setFieldValByName("createdate", now, metaObject);
+            }
+            Object modifyDate = this.getFieldValByName("modifydate", metaObject);
+            if(null == modifyDate){
+                this.setFieldValByName("modifydate", now, metaObject);
+            }
+            Object createuserid = this.getFieldValByName("createuserid", metaObject);
+            if(null == createuserid && sysUser != null){
+                this.setFieldValByName("createuserid", sysUser.getId(), metaObject);
+            }
+            Object createusername = this.getFieldValByName("createusername", metaObject);
+            if(null == createusername && sysUser != null){
+                this.setFieldValByName("createusername", sysUser.getName(), metaObject);
+            }
+            Object modifyuserid = this.getFieldValByName("modifyuserid", metaObject);
+            if(null == modifyuserid && sysUser != null){
+                this.setFieldValByName("modifyuserid", sysUser.getId(), metaObject);
+            }
+            Object modifyusername = this.getFieldValByName("modifyusername", metaObject);
+            if(null == modifyusername && sysUser != null){
+                this.setFieldValByName("modifyusername", sysUser.getName(), metaObject);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try{
+            logger.info("start update fill ....");
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if(attributes == null){
+                return;
+            }
+            HttpServletRequest request = attributes.getRequest();
+            if(request == null){
+                return;
+            }
+            String token = request.getHeader("token");
+            if(token == null || "".equals(token)){
+                return;
+            }
+            SysUserVo sysUser = redisService.getLoginUser(token);
+
+            Date now = new Date();
+
+            Object modifyDate = this.getFieldValByName("modifydate", metaObject);
+            if(null == modifyDate){
+                this.setUpdateFieldValByName("modifydate", now, metaObject);
+            }
+            Object modifyuserid = this.getFieldValByName("modifyuserid", metaObject);
+            if(null == modifyuserid && sysUser != null){
+                this.setUpdateFieldValByName("modifyuserid", sysUser.getId(), metaObject);
+            }
+            Object modifyusername = this.getFieldValByName("modifyusername", metaObject);
+            if(null == modifyusername && sysUser != null){
+                this.setUpdateFieldValByName("modifyusername", sysUser.getName(), metaObject);
+            }
+            //this.setFieldValByName("operator", "Tom", metaObject);
+            //this.setUpdateFieldValByName("operator", "Tom", metaObject);//@since 快照：3.0.7.2-SNAPSHOT， @since 正式版暂未发布3.0.7
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QQuestionFiveWhyDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -42,6 +44,7 @@ public class QQuestionFiveWhyDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QQuestionMindMappingDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDao;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -48,6 +50,7 @@ public class QQuestionMindMappingDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QuShiftDetailDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class QuShiftDetailDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QuShiftDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class QuShiftDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QuShiftLeaderDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class QuShiftLeaderDo  extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/QuSyncMesErrorDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class QuSyncMesErrorDo  extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmActionPlanDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmActionPlanDo  extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDAnalysislistDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.bsentity.domin;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -23,6 +25,7 @@ public class SrmEightDAnalysislistDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDCauselistDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmEightDCauselistDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDHistoryDo.java

@@ -1,5 +1,6 @@
 package com.rongwei.bsentity.domin;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -36,7 +37,7 @@ public class SrmEightDHistoryDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
-    @TableField("TENANTID")
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDListDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.bsentity.domin;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -23,6 +25,7 @@ public class SrmEightDListDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDPlanDo.java

@@ -1,10 +1,8 @@
 package com.rongwei.bsentity.domin;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 
 import com.rongwei.rwcommon.base.BaseDo;
@@ -37,7 +35,7 @@ public class SrmEightDPlanDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
-    @TableField("TENANTID")
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmEightDPlanlistDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmEightDPlanlistDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmFiveWhyDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmFiveWhyDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmInterimActionDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmInterimActionDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmIssuesFiveWhyDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class SrmIssuesFiveWhyDo extends BaseDo  implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SrmIssuesListDo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -24,6 +26,7 @@ public class SrmIssuesListDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-entity/src/main/java/com/rongwei/bsentity/domin/SysMindMappingDo.java

@@ -3,6 +3,8 @@ package com.rongwei.bsentity.domin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -77,6 +79,7 @@ public class SysMindMappingDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

cx_question/business-server/src/main/java/com/rongwei/BusinessServerApplication.java

@@ -1,10 +1,13 @@
 package com.rongwei;
 
+import com.rongwei.rwcommonconfig.config.interceptor.BaseMetaObjectHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableAsync
@@ -12,6 +15,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableDiscoveryClient
 @EnableFeignClients
 @MapperScan(value = {"com.rongwei.*.*.dao","com.rongwei.*.*.*.dao"})
+@ComponentScan(basePackages = {"com.rongwei"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+        classes = {BaseMetaObjectHandler.class}))
 public class BusinessServerApplication {
 
     public static void main(String[] args) {

cx_question/business-server/src/main/java/com/rongwei/controller/QuestionController.java

@@ -1,9 +1,7 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.OrgUserSyncService;
-import com.rongwei.bscommon.sys.service.SlaveSourceService;
-import com.rongwei.bscommon.sys.service.SrmIssuesListService;
-import com.rongwei.bscommon.sys.service.SysMindMappingBsService;
+import com.rongwei.bscommon.sys.service.*;
+import com.rongwei.bsentity.domin.QuShiftDo;
 import com.rongwei.bsentity.domin.SrmIssuesListDo;
 import com.rongwei.bsentity.vo.VDeptVo;
 import com.rongwei.rwcommon.base.R;
@@ -31,6 +29,8 @@ public class QuestionController {
     private SlaveSourceService slaveSourceService;
     @Autowired
     private OrgUserSyncService orgUserSyncService;
+    @Autowired
+    private QuShiftService quShiftService;
 
     /**
      * 故障树图片保存
@@ -58,7 +58,11 @@ public class QuestionController {
      */
     @PostMapping("/testOne")
     public R testOne(@RequestBody Map<String,Object> map) throws IOException {
-        orgUserSyncService.orgSync();
+//        orgUserSyncService.orgSync();
+
+        QuShiftDo quShiftDo = new QuShiftDo();
+        quShiftDo.setId("11111");
+        quShiftService.save(quShiftDo);
         return R.ok();
     }
 

cx_question/pom.xml

@@ -51,6 +51,11 @@
             <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>bs-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <repositories>

pom.xml

@@ -11,6 +11,7 @@
         <module>cx_question</module>
         <module>rw-training</module>
         <module>safe-check</module>
+        <module>bs-common</module>
     </modules>
 
     <parent>

rw-training/pom.xml

@@ -17,5 +17,11 @@
         <module>training-server</module>
     </modules>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>bs-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

rw-training/training-entity/src/main/java/com/rongwei/training/domain/CourseDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -72,6 +74,7 @@ public class CourseDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/CourseFilesDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -69,6 +71,7 @@ public class CourseFilesDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/EmpCourseDetailDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -64,6 +66,7 @@ public class EmpCourseDetailDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/EmpCourseDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -59,6 +61,7 @@ public class EmpCourseDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/EmpExamDetailDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -43,6 +45,7 @@ public class EmpExamDetailDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 租户ID

rw-training/training-entity/src/main/java/com/rongwei/training/domain/EmpExamDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -68,6 +70,7 @@ public class EmpExamDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/ExamPaperDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -63,6 +65,7 @@ public class ExamPaperDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/PaperSubjectAssignDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -68,6 +70,7 @@ public class PaperSubjectAssignDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/PaperSubjectAutoDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -60,6 +62,7 @@ public class PaperSubjectAutoDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/PlanCourseDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -60,6 +62,7 @@ public class PlanCourseDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/PlanDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -80,6 +82,7 @@ public class PlanDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
     /**
      * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/PlanPaperDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -56,6 +58,7 @@ public class PlanPaperDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/SubjectDo.java

@@ -1,11 +1,8 @@
 package com.rongwei.training.domain;
 
-import com.baomidou.mybatisplus.annotation.SqlCondition;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -51,6 +48,7 @@ public class SubjectDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-entity/src/main/java/com/rongwei/training/domain/SubjectOptionsDo.java

@@ -1,5 +1,7 @@
 package com.rongwei.training.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -48,6 +50,7 @@ public class SubjectOptionsDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

rw-training/training-server/src/main/java/com/rongwei/RwTrainingApplication.java

@@ -1,17 +1,22 @@
 package com.rongwei;
 
 import com.codingapi.txlcn.tc.config.EnableDistributedTransaction;
+import com.rongwei.rwcommonconfig.config.interceptor.BaseMetaObjectHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
 @MapperScan("com.rongwei.*.*.dao")
 @EnableDistributedTransaction
+@ComponentScan(basePackages = {"com.rongwei"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+        classes = {BaseMetaObjectHandler.class}))
 public class RwTrainingApplication {
 
     public static void main(String[] args) {

safe-check/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>InControl</artifactId>
+        <artifactId>safe-produce</artifactId>
         <groupId>com.rongwei</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -17,5 +17,11 @@
         <module>save-check-server</module>
     </modules>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>bs-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AccidentDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -108,6 +110,7 @@ public class AccidentDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AccidentObjectDo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -51,6 +53,7 @@ public class AccidentObjectDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AccidentTrackPlanDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -56,6 +58,7 @@ public class AccidentTrackPlanDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AccidentUserDo.java

@@ -3,6 +3,8 @@ package com.rongwe.scentity.domian;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -74,6 +76,7 @@ public class AccidentUserDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AspCheckDiscoveryItemDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
@@ -83,6 +85,7 @@ public class AspCheckDiscoveryItemDo extends BaseDo implements Serializable {
     /**
      * 租户ID
      */
+    @TableField(value = "TENANTID", fill = FieldFill.INSERT)
     private String tenantid;
 
     /**

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckItemContentDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -80,6 +82,7 @@ public class CheckItemContentDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckItemsDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -93,6 +95,7 @@ public class CheckItemsDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckItemsDutyuserDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,6 +46,7 @@ public class CheckItemsDutyuserDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckItemsPartsDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,6 +46,7 @@ public class CheckItemsPartsDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckTemplateDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -74,6 +76,7 @@ public class CheckTemplateDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/CheckTemplateItemsDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -86,6 +88,7 @@ public class CheckTemplateItemsDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/HiddenDangerTrackDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -117,6 +119,7 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/PointCheckDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -83,6 +85,7 @@ public class PointCheckDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/PointCheckItemDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -88,6 +90,7 @@ public class PointCheckItemDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/SafetyObservationDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -76,6 +78,7 @@ public class SafetyObservationDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckContentDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -60,6 +62,7 @@ public class ThemeCheckContentDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -60,6 +62,7 @@ public class ThemeCheckDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckItemDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -116,6 +118,7 @@ public class ThemeCheckItemDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckWorkparkDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -64,6 +66,7 @@ public class ThemeCheckWorkparkDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/WarnLevelDo.java

@@ -1,5 +1,7 @@
 package com.rongwe.scentity.domian;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -36,6 +38,7 @@ public class WarnLevelDo extends BaseDo implements Serializable {
 	/**
 	 * 租户ID
 	 */
+	@TableField(value = "TENANTID", fill = FieldFill.INSERT)
 	private String tenantid;
 	/**
 	 * 扩展json格式配置

safe-check/save-check-server/src/main/java/com/rongwei/RwSaveCheckApplication.java

@@ -1,11 +1,14 @@
 package com.rongwei;
 
 import com.codingapi.txlcn.tc.config.EnableDistributedTransaction;
+import com.rongwei.rwcommonconfig.config.interceptor.BaseMetaObjectHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
@@ -14,6 +17,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @MapperScan("com.rongwei.*.*.dao")
 @EnableDistributedTransaction
 @EnableAsync
+@ComponentScan(basePackages = {"com.rongwei"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+        classes = {BaseMetaObjectHandler.class}))
 public class RwSaveCheckApplication {
 
     public static void main(String[] args) {