!258 修复导入用户后编辑报错;修复不退出模拟直接保存模型,后续分配规则报错
Merge pull request !258 from wangjun/master
This commit is contained in:
commit
9bf1e10668
@ -416,7 +416,7 @@ public class AdminUserServiceImpl implements AdminUserService {
|
||||
AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
|
||||
if (existUser == null) {
|
||||
userMapper.insert(UserConvert.INSTANCE.convert(importUser)
|
||||
.setPassword(encodePassword(userInitPassword))); // 设置默认密码
|
||||
.setPassword(encodePassword(userInitPassword)).setPostIds(new HashSet<>())); // 设置默认密码及空岗位编号数组
|
||||
respVO.getCreateUsernames().add(importUser.getUsername());
|
||||
return;
|
||||
}
|
||||
|
@ -72,7 +72,7 @@
|
||||
<el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" />
|
||||
</el-tooltip>
|
||||
</el-button-group>
|
||||
<el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave">保存模型</el-button>
|
||||
<el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave" :disabled = "simulationStatus">保存模型</el-button>
|
||||
</template>
|
||||
<!-- 用于打开本地文件-->
|
||||
<input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" />
|
||||
|
Loading…
Reference in New Issue
Block a user