From 74472c9d22dddcb41383794caf0011043b20f817 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 13:25:47 +0800
Subject: [PATCH] fix 数据权限
---
src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
index fc0e092..1eb63cb 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
@@ -1,6 +1,7 @@
package com.highdatas.mdm.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.highdatas.mdm.entity.*;
import com.highdatas.mdm.mapper.SysAssembleMapper;
import com.highdatas.mdm.mapper.TableInfoMapper;
@@ -9,24 +10,17 @@
import com.highdatas.mdm.pojo.kettle.DataSourceInfo;
import com.highdatas.mdm.pojo.kettle.UnBigDataDataSourceInfo;
import com.highdatas.mdm.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.ContentBuilder;
import com.highdatas.mdm.util.DbUtils;
import com.highdatas.mdm.util.RuleClient;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.regexp.RE;
-import org.jcodings.util.Hash;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -83,9 +77,10 @@
ITUserService userService;
@Autowired
RuleClient ruleClient;
+ @Autowired
+ IMasterModifiedService masterModifiedService;
@Override
- @Transactional(rollbackFor=Exception.class)
public Result run(String id) {
if (StringUtils.isEmpty(id)) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
@@ -123,7 +118,6 @@
}
}
}
-
Boolean bigData = assemble.getBigdata();
@@ -231,6 +225,9 @@
//榛樿闇�瑕佸鎵�
audit = true;
}
+ // 澶勭悊鍏宠仈浜�
+
+
if (audit) {
String chargeId = menuMapping.getChargeId();
TUser user = userService.selectById(chargeId);
@@ -243,6 +240,7 @@
maintain.setFlowId(flows.getId());
maintain.setDesp("鍚姩姹囬泦娴佺▼");
maintain.updateById();
+ masterModifiedService.dealAssemble(maintain.getId(), assemble.getUserId(), true);
}else {
//鐩存帴杩愯
Flows flows = new Flows().setStatus(ActivitiStatus.open).setBusinessId(maintain.getId()).setId(DbUtils.getUUID()).setCreateTime(new Date());
@@ -250,6 +248,7 @@
maintain.setFlowId(flows.getId());
maintain.updateById();
maintainService.dealFlow(maintain.getId(), ActivitiStatus.open);
+ masterModifiedService.dealAssemble(maintain.getId(), assemble.getUserId(), false);
}
return Result.success(null);
}catch (Exception e) {
@@ -384,10 +383,9 @@
PreparedStatement updatedPreparedStatement = conn.prepareStatement(updatedSql);
int updateCnt = updatedPreparedStatement.executeUpdate();
cnt = updateCnt;
+ tableInfoMapper.insertMatintainDetailFromTemp(DbUtils.quotedStr(maintain.getId()), maintain.getTableName() + Constant.RECORD , DbUtils.quotedStr(Operate.update.toString()));
}
}
-
- tableInfoMapper.insertMatintainDetailFromTemp(DbUtils.quotedStr(maintain.getId()), maintain.getTableName() + Constant.RECORD , DbUtils.quotedStr(Operate.update.toString()));
//tableInfoMapper.updateStdId( maintain.getTableName() + Constant.RECORD);
@@ -412,6 +410,7 @@
}
}
}
+
private Result temp2record(SysAssemble assemble) {
Connection conn = null;
try {
@@ -461,7 +460,6 @@
String joinStr = getJoinFieldParse(unionCodeFields);
// insert
-
String insertFieldStr = fieldsFromTable.stream()
.map(s -> MessageFormat.format(Constant.Alias,Constant.T1,s))
.collect(Collectors.joining(Constant.COMMA));
--
Gitblit v1.8.0