Merge remote-tracking branch 'origin/main'

SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java

@@ -1750,7 +1750,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService {
             if (FlowTaskOperatorEnum.DepartmentCharge.getCode().equals(type)) {
                 UserEntity userEntity = serviceUtil.getUserInfo(createUserId);
                 if (userEntity != null) {
-                    OrganizeEntity organizeEntity = serviceUtil.getOrganizeInfo(userEntity.getOrganizeId());
+                    OrganizeEntity organizeEntity = serviceUtil.getOrganizeInfo(userEntity.getDepartmentId());
                     if (organizeEntity != null) {
                         userId = organizeEntity.getManager();
                         userIdAll.add(userId);
@@ -2338,7 +2338,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService {
         if (FlowTaskOperatorEnum.DepartmentCharge.getCode().equals(type)) {
             UserEntity userEntity = serviceUtil.getUserInfo(createUserId);
             if (userEntity != null) {
-                OrganizeEntity organizeEntity = serviceUtil.getOrganizeInfo(userEntity.getOrganizeId());
+                OrganizeEntity organizeEntity = serviceUtil.getOrganizeInfo(userEntity.getDepartmentId());
                 if (organizeEntity != null) {
                     userId = organizeEntity.getManager();
                     userIdAll.add(userId);

SC-web/src/views/system/sysConfig/index.vue

@@ -143,6 +143,35 @@
         </el-tab-pane>
         <el-tab-pane label="第三方设置" name="third">
           <el-tabs tab-position="left" style="height:100%" v-model="thirdTab" class="thirdTab">
+			<el-tab-pane label="APP配置">
+			  <!-- <el-alert title="注意：请在短信厂家官网网站开通申请" type="warning" :closable="false" show-icon /> -->
+			  <el-row style="margin-top: 15px" v-if="thirdTab=='0'">
+				<el-col :span="12">
+				  <jnpf-form-tip-item label="APP版本号" prop="appVersion" label-width="180px"
+					tip-label="APP版本号">
+					<el-input v-model="baseForm.appVersion" clearable
+					  placeholder="请输入APP版本号,例V3.4.4" />
+				  </jnpf-form-tip-item>
+				  <jnpf-form-tip-item label="是否强制更新" prop="forceUpdates" label-width="180px"
+					tip-label="是否强制更新">
+					  <el-select v-model="baseForm.forceUpdates" placeholder="请选择">
+						<el-option label="否" :value="0" />
+						 <el-option label="是" :value="1" />
+					  </el-select>
+				  </jnpf-form-tip-item>
+				  <jnpf-form-tip-item label="更新内容" prop="updatesDescription" label-width="180px"
+					tip-label="更新内容">
+					<el-input v-model="baseForm.updatesDescription" type="textarea"
+					  :autosize="{ minRows: 5, maxRows: 10}" placeholder="更新内容" />
+				  </jnpf-form-tip-item>
+				  <el-form-item label-width="180px">
+					<el-button type="primary" size="small" :loading="btnLoading" class="saveBtn"
+					  @click="submitForm()">保 存</el-button>
+				  </el-form-item>
+				</el-col>
+			  </el-row>
+			</el-tab-pane>
+						
             <el-tab-pane label="阿里短信">
               <!-- <el-alert title="注意：请在短信厂家官网网站开通申请" type="warning" :closable="false" show-icon /> -->
               <el-row style="margin-top: 15px" v-if="thirdTab=='0'">
@@ -455,6 +484,9 @@ export default {
         emailAccount: '',
         emailPassword: '',
         emailSsl: 0,
+		appVersion: '',
+		forceUpdates: 0,
+		updatesDescription: '',
         aliAccessKey: '',
         aliSecret: '',
         tencentSecretId: '',
@@ -478,6 +510,15 @@ export default {
         enableVerificationCode: 0
       },
       rules: {
+		appVersion: [
+			{ required: true, message: 'APP版本号不能为空', trigger: 'blur' }
+		],
+		forceUpdates: [
+			{ required: true, message: '是否强制更新必选', trigger: 'blur' }
+		],
+		updatesDescription: [
+			{ required: true, message: '更新内容不能为空', trigger: 'blur' }
+		],
         aliAccessKey: [
           { required: true, message: 'AccessKey ID不能为空', trigger: 'blur' }
         ],