ソースを参照

appendtask需要调用empower

Zhou Rui 5 年 前
コミット
896aa60135

+ 1 - 1
o2server/configSample/processPlatform.json

@@ -36,7 +36,7 @@
   "deleteDraft": {
     "enable": false,
     "cron": "0 0 20 * * ?",
-    "thresholdMinutes": 14400.0,
+    "thresholdMinutes": 86400.0,
     "###enable": "是否启用###",
     "###cron": "定时cron表达式###",
     "###thresholdMinutes": "设定阈值,如果超过这个时间认为是可以删除的草稿,默认为10天.###"

+ 7 - 1
o2server/configSample/qiyeweixin.json

@@ -13,6 +13,9 @@
   "messageRedirectPortal": "",
   "messageEnable": false,
   "scanLoginEnable": false,
+  "attendanceSyncEnable": false,
+  "attendanceSyncAgentId": "",
+  "attendanceSyncSecret": "",
   "###enable": "是否启用.###",
   "###syncCron": "拉入同步cron,默认每10分钟同步一次.###",
   "###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
@@ -26,5 +29,8 @@
   "###workUrl": "企业微信消息打开工作的url地址,如:http://dev.o2oa.net/x_desktop/###",
   "###messageRedirectPortal": "企业微信消息处理完成后跳转到特定的门户页面的Id###",
   "###messageEnable": "推送消息到企业微信###",
-  "###scanLoginEnable": "企业微信扫码登录###"
+  "###scanLoginEnable": "企业微信扫码登录###",
+  "###attendanceSyncEnable": "是否启用考勤信息###",
+  "###attendanceSyncAgentId": "企业微信考勤打卡应用id###",
+  "###attendanceSyncSecret": "企业微信考勤打卡应用secret###"
 }

+ 5 - 3
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -31,6 +31,7 @@ import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.entity.element.Activity;
 import com.x.processplatform.core.entity.element.ActivityType;
 import com.x.processplatform.core.entity.element.Manual;
+import com.x.processplatform.core.entity.element.Process;
 import com.x.processplatform.core.entity.element.Route;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapAppend;
 import com.x.processplatform.service.processing.ApplicationDictHelper;
@@ -104,8 +105,9 @@ class ActionAppend extends BaseAction {
 							}
 						}
 					}
+					Process process = business.element().get(task.getProcess(), Process.class);
 					identities = business.organization().identity().list(ListTools.trim(identities, true, true));
-					TaskIdentities taskIdentities = empower(business, task, identities);
+					TaskIdentities taskIdentities = empower(business,process, task, identities);
 					identities = taskIdentities.identities();
 					if (ListTools.isNotEmpty(identities)) {
 						List<TaskCompleted> os = emc.listEqualAndInAndNotEqual(TaskCompleted.class,
@@ -160,10 +162,10 @@ class ActionAppend extends BaseAction {
 		return scriptContext;
 	}
 
-	private TaskIdentities empower(Business business, Task task, List<String> identities) throws Exception {
+	private TaskIdentities empower(Business business,Process process, Task task, List<String> identities) throws Exception {
 		TaskIdentities taskIdentities = new TaskIdentities();
 		taskIdentities.addIdentities(identities);
-		taskIdentities.empower(business.organization().empower().listWithIdentityObject(task.getApplication(),
+		taskIdentities.empower(business.organization().empower().listWithIdentityObject(task.getApplication(),process.getEdition(),
 				task.getProcess(), task.getWork(), identities));
 		return taskIdentities;
 	}