--后台支持角色查询

zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue

@@ -344,7 +344,7 @@
       field: 'checkSendRole',
       component: 'JSelectRole',
       required: false,
-      ifShow: computed(() => userType.value === 'role'),
+      ifShow: computed(() => userType.value !== 'user'),
       componentProps: {
         labelKey: 'roleName',
         rowKey: 'id',

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -168,7 +168,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     // 写入 待办
 
                     MyTask myTask = new MyTask();
-                    myTask.setUid(approvalId);
+                    if(userType.equals("user")) {
+                        myTask.setUid(approvalId);
+                    } else {
+                        myTask.setRoleid(approvalId);
+                    }
+
                     myTask.setTp(5);
                     myTask.setTarget(nextTask.getName());
                     if(zdval!=null&&!zdval.equals("")){
@@ -183,7 +188,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     myTask.setDes("");
                     //myTask.setLinkAddr("/project/plan/StPlanManList?"+zdmc+"="+zdval);
                     if(sysForm!=null){
-                        myTask.setLinkAddr(sysForm.getFormListurl());
+                        if(sysForm.getFormTp().equals("2")){
+                            myTask.setLinkAddr(sysForm.getFormListurl());
+                        }else{
+                            myTask.setLinkAddr("/flowable/task/todo/index");
+                        }
+
                     }
 
                     myTaskService.save(myTask);

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/entity/MyTask.java

@@ -96,4 +96,6 @@ public class MyTask implements Serializable {
 	@Excel(name = "描述", width = 15)
     
     private String des;
+
+    private String roleid;
 }