From d706cc3fb3af0e94bd91d3731715f6b9ce05e78d Mon Sep 17 00:00:00 2001
From: wangjun <wangjun@huaqi.info>
Date: Fri, 26 Aug 2022 09:32:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8E=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/system/service/user/AdminUserServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index ac1736959..5f4c9a2f2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/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 {
             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;
             }

From e25b73b7d9c596e04fc975fc0683af54b0d5b96c Mon Sep 17 00:00:00 2001
From: wangjun <wangjun@huaqi.info>
Date: Fri, 26 Aug 2022 09:33:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=8B=9F=E7=9B=B4=E6=8E=A5=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpmnProcessDesigner/package/designer/ProcessDesigner.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
index 215f3aaf0..4be2959a8 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
@@ -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" />