Commit 9f0b9672 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10

parents 642bf9bb 2dd607b6
...@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
socialInfo.setDispatchId(disExist.getId()); socialInfo.setDispatchId(disExist.getId());
} }
// 加流程进展明细 // 加流程进展明细
tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user, CommonConstants.TWO_STRING); tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user
, CommonConstants.ONE_STRING);
return R.ok("成功"); return R.ok("成功");
} else { } else {
return R.failed("状态未变更,请刷新后查看列表状态!"); return R.failed("状态未变更,请刷新后查看列表状态!");
......
...@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List<String> list2 = list.stream().map(PersonVo::getUid).collect(Collectors.toList()); List<String> list2 = list.stream().map(PersonVo::getUid).collect(Collectors.toList());
List<String> collect = list1.stream().filter(s -> !list2.contains(s) List<String> collect = list1.stream().filter(s -> !list2.contains(s)
).collect(Collectors.toList()); ).collect(Collectors.toList());
log.error("要重置为不可用的用户列表:" + collect);
if (!collect.isEmpty()) { if (!collect.isEmpty()) {
log.error("要重置为不可用的用户列表:" + collect);
LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>();
settleUpdate.in(SysUser::getUsername, collect) settleUpdate.in(SysUser::getUsername, collect)
.set(SysUser::getDelFlag, CommonConstants.ONE_STRING); .set(SysUser::getDelFlag, CommonConstants.ONE_STRING);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment