修改用户单位管理模块

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -300,7 +300,9 @@ public class TApproveDangerController extends BaseController
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         List<Task> taskList = processEngine.getTaskService()//获取任务service
                 .createTaskQuery()//创建查询对象
-                .taskAssignee(getUserId().toString()).orderByTaskCreateTime().desc()//参与者，组任务查询
+                .taskCandidateOrAssigned(getUserId().toString())
+//                .taskAssignee(getUserId().toString())
+                .orderByTaskCreateTime().desc()//参与者，组任务查询
                 .listPage(Integer.parseInt((String) params.get("pageNum")) - 1, Integer.parseInt((String) params.get("pageSize")));
         //分页数据
         Long count = processEngine.getTaskService().createTaskQuery().taskCandidateUser(getUserId().toString()).count();

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -117,16 +117,51 @@ public class TApproveReserveInvoiceController extends BaseController {
         long bussniseeKey = tApproveReserveInvoice.getId();
         String[] ids;
         ids = tApproveReserveInvoice.getInvoiceId().split(",");
+        String devSupId = "";
         for (String id : ids) {
             TInvoiceBookingworkticket invoice = workService.getById(id);
             invoice.setStatus(1L);
             workService.updateById(invoice);
+            switch (invoice.getWorkArea()){
+                case "310裂解区":
+                case "700开关锅炉":
+                case "320裂解区":
+                case "250管廊-700":
+                    devSupId="20253,20257";
+                    break;
+                case "330压缩区":
+                case "废水处理":
+                case "600废碱":
+                case "250管廊-600":
+                    devSupId="20249,20317";
+                    break;
+                case "380分离区":
+                case "360分离区":
+                case "350分离区":
+                case "340分离区":
+                    devSupId="20252";
+                    break;
+                case "400汽油加氢":
+                case "250管廊-400":
+                    devSupId="20248";
+                    break;
+                case "500芳烃抽提":
+                case "250管廊-500":
+                    devSupId="20244";
+                    break;
+                case "D301控制楼":
+                case " D201变电所":
+                case " 维修厂房":
+                case "危废车库":
+                    devSupId="20332,20250,20276";
+                    break;
+            }
         }
         //开始工作流、监听
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyUser", userid.toString());
         variables.put("yhzgusers", tApproveReserveInvoice.getUserSupId());//用户主管
-        variables.put("zzzgusers", tApproveReserveInvoice.getDevSupId());//装置主管
+        variables.put("zzzgusers", devSupId);//装置主管
         if ("1".equals(tApproveReserveInvoice.getIsToday())) {
             variables.put("zzgcsusers", tApproveReserveInvoice.getDevEngineerId());//装置工程师
             variables.put("zzgcsTaskCreateListener",new ZzgcsTaskCreateListener());//装置工程师监听发送邮件

master/src/main/resources/processes/reserveInvoice.bpmn

@@ -3,7 +3,7 @@
   <process id="reserveInvoice" name="预约开票审批流程" isExecutable="true">
     <startEvent id="start" name="开始" activiti:initiator="${applyUserId}"></startEvent>
     <userTask id="yhzgtask" name="用户主管签字确认" activiti:assignee="#{yhzgusers}"></userTask>
-    <userTask id="zzzgtask" name="装置主管签字确认" activiti:assignee="#{zzzgusers}"></userTask>
+    <userTask id="zzzgtask" name="装置主管签字确认"  activiti:candidateUsers="#{zzzgusers}"></userTask>
     <sequenceFlow id="flow2" name="通过" sourceRef="yhzgtask" targetRef="zzzgtask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>

ui/src/views/invoice/approveinvoice/index.vue

@@ -66,20 +66,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="装置主管" prop="devSupId">
-              <el-select v-model="form.devSupId" filterable :placeholder="$t('请选择') + $t('装置主管')">
-                <el-option
-                  v-for="dict in managerOptions"
-                  :key="dict.userId"
-                  :label="dict.nickName"
-                  :value="dict.userId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="装置主管" prop="devSupId">-->
+<!--              <el-select v-model="form.devSupId" filterable :placeholder="$t('请选择') + $t('装置主管')">-->
+<!--                <el-option-->
+<!--                  v-for="dict in managerOptions"-->
+<!--                  :key="dict.userId"-->
+<!--                  :label="dict.nickName"-->
+<!--                  :value="dict.userId">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="this.isToday" label="装置工程师" prop="devEngineerId">
@@ -208,9 +208,6 @@ export default {
         userSupId: [
           {required: true, message: this.$t('用户主管') + this.$t('不能为空'), trigger: "blur"}
         ],
-        devSupId: [
-          {required: true, message: this.$t('装置主管') + this.$t('不能为空'), trigger: "blur"}
-        ],
         managerconId: [
           {required: true, message: this.$t('装置经理') + this.$t('不能为空'), trigger: "blur"}
         ],