From b5636e416a2fe029f96aec6ddfd3489394925b15 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 24 三月 2020 19:33:53 +0800
Subject: [PATCH] add 数据权限
---
src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..b2a53f2 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
@@ -83,9 +83,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);
@@ -231,6 +232,9 @@
//榛樿闇�瑕佸鎵�
audit = true;
}
+ // 澶勭悊鍏宠仈浜�
+
+
if (audit) {
String chargeId = menuMapping.getChargeId();
TUser user = userService.selectById(chargeId);
@@ -243,6 +247,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 +255,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 +390,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 +417,7 @@
}
}
}
+
private Result temp2record(SysAssemble assemble) {
Connection conn = null;
try {
@@ -461,7 +467,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