工作流代码提交

snowy-base/snowy-common/src/main/java/vip/xiaonuo/common/pojo/CommonEntity.java

@@ -15,7 +15,6 @@ package vip.xiaonuo.common.pojo;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
 import com.fhs.core.trans.vo.TransPojo;
@@ -42,17 +41,17 @@ public class CommonEntity implements Serializable, TransPojo {
     /** 删除标志 */
     @TableLogic
     @ApiModelProperty(value = "删除标志", position = 999)
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value="delete_flag",fill = FieldFill.INSERT)
     private String deleteFlag;
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间", position = 1000)
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value="create_time",fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 创建人 */
     @ApiModelProperty(value = "创建人", position = 1001)
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value="create_user",fill = FieldFill.INSERT)
     @Trans(type = TransType.RPC, targetClassName = "vip.xiaonuo.sys.modular.user.entity.SysUser", fields = "name", alias = "createUser", ref = "createUserName", serviceName = "snowy-web-app")
     private String createUser;
 
@@ -63,12 +62,12 @@ public class CommonEntity implements Serializable, TransPojo {
 
     /** 更新时间 */
     @ApiModelProperty(value = "更新时间", position = 1003)
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(value="update_time",fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 更新人 */
     @ApiModelProperty(value = "更新人", position = 1004)
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(value="update_user",fill = FieldFill.UPDATE)
     @Trans(type = TransType.RPC, targetClassName = "vip.xiaonuo.sys.modular.user.entity.SysUser", fields = "name", alias = "updateUser", ref = "updateUserName", serviceName = "snowy-web-app")
     private String updateUser;
 

snowy-plugin/snowy-plugin-flw/snowy-plugin-flw-func/src/main/java/vip/xiaonuo/flw/core/util/NodeRuntimeUtil.java

@@ -1246,14 +1246,16 @@ public class NodeRuntimeUtil {
      * @date 2022/7/21 16:03
      **/
     public static void handleTenAuth() {
-        TenApi tenApi = SpringUtil.getBean(TenApi.class);
+
+     //   TenApi tenApi = SpringUtil.getBean(TenApi.class);
         IdentityService identityService = SpringUtil.getBean(IdentityService.class);
-        if(tenApi.getTenEnabled()) {
-            identityService.setAuthentication(StpUtil.getLoginIdAsString(), null,
-                    CollectionUtil.newArrayList(tenApi.getCurrentTenId()));
-        } else {
-            identityService.setAuthenticatedUserId(StpUtil.getLoginIdAsString());
-        }
+        identityService.setAuthenticatedUserId(StpUtil.getLoginIdAsString());
+//        if(tenApi.getTenEnabled()) {
+//            identityService.setAuthentication(StpUtil.getLoginIdAsString(), null,
+//                    CollectionUtil.newArrayList(tenApi.getCurrentTenId()));
+//        } else {
+//            identityService.setAuthenticatedUserId(StpUtil.getLoginIdAsString());
+//        }
     }
 
     /**

snowy-plugin/snowy-plugin-flw/snowy-plugin-flw-func/src/main/java/vip/xiaonuo/flw/modular/process/service/impl/FlwProcessServiceImpl.java

@@ -49,7 +49,6 @@ import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.common.pojo.CommonEntity;
 import vip.xiaonuo.common.util.CommonTimeFormatUtil;
 import vip.xiaonuo.flw.core.listener.FlwGlobalCustomEventCenter;
 import vip.xiaonuo.flw.core.node.FlwNode;
@@ -213,7 +212,7 @@ public class FlwProcessServiceImpl implements FlwProcessService {
     public Page<FlwProcessMyDraftResult> myDraftPage(FlwProcessMyDraftPageParam flwProcessMyDraftPageParam) {
         LambdaQueryWrapper<FlwRelation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         // 查询当前用户的
-        lambdaQueryWrapper.eq(CommonEntity::getCreateUser, StpUtil.getLoginIdAsString());
+        lambdaQueryWrapper.eq(FlwRelation::getCreateUser, StpUtil.getLoginIdAsString());
         if(ObjectUtil.isNotEmpty(flwProcessMyDraftPageParam.getName())) {
             lambdaQueryWrapper.like(FlwRelation::getExtJson, flwProcessMyDraftPageParam.getName());
         }

snowy-plugin/snowy-plugin-flw/snowy-plugin-flw-func/src/main/java/vip/xiaonuo/flw/modular/relation/entity/FlwRelation.java

@@ -12,10 +12,10 @@
  */
 package vip.xiaonuo.flw.modular.relation.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
-import vip.xiaonuo.common.pojo.CommonEntity;
 
 /**
  * 工作流关系实体
@@ -26,23 +26,31 @@ import vip.xiaonuo.common.pojo.CommonEntity;
 @Getter
 @Setter
 @TableName("ACT_EXT_RELATION")
-public class FlwRelation extends CommonEntity {
+public class FlwRelation{
 
     /** id */
     private String id;
 
     /** 租户id */
+    @TableField(value="tenant_id")
     private String tenantId;
 
     /** 对象id */
+    @TableField(value="object_id")
     private String objectId;
 
     /** 目标id */
+    @TableField(value="target_id")
     private String targetId;
 
     /** 分类 */
+    @TableField(value="category")
     private String category;
 
     /** 扩展信息 */
+    @TableField(value="ext_json")
     private String extJson;
+
+    @TableField(value="create_user")
+    private String createUser;
 }