Commit 9bf1e1066851c9246de467a4c8be454b1a6d0865
Committed by
Gitee
Gitee
!258 修复导入用户后编辑报错；修复不退出模拟直接保存模型，后续分配规则报错
Merge pull request !258 from wangjun/master
Showing
2 changed files
with
2 additions
and
2 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
| @@ -416,7 +416,7 @@ public class AdminUserServiceImpl implements AdminUserService { | @@ -416,7 +416,7 @@ public class AdminUserServiceImpl implements AdminUserService { | ||
| 416 | AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername()); | 416 | AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername()); |
| 417 | if (existUser == null) { | 417 | if (existUser == null) { |
| 418 | userMapper.insert(UserConvert.INSTANCE.convert(importUser) | 418 | userMapper.insert(UserConvert.INSTANCE.convert(importUser) |
| 419 | - .setPassword(encodePassword(userInitPassword))); // 设置默认密码 | 419 | + .setPassword(encodePassword(userInitPassword)).setPostIds(new HashSet<>())); // 设置默认密码及空岗位编号数组 |
| 420 | respVO.getCreateUsernames().add(importUser.getUsername()); | 420 | respVO.getCreateUsernames().add(importUser.getUsername()); |
| 421 | return; | 421 | return; |
| 422 | } | 422 | } |
yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | <el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" /> | 72 | <el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" /> |
| 73 | </el-tooltip> | 73 | </el-tooltip> |
| 74 | </el-button-group> | 74 | </el-button-group> |
| 75 | - <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave">保存模型</el-button> | 75 | + <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave" :disabled = "simulationStatus">保存模型</el-button> |
| 76 | </template> | 76 | </template> |
| 77 | <!-- 用于打开本地文件--> | 77 | <!-- 用于打开本地文件--> |
| 78 | <input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" /> | 78 | <input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" /> |