Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyMapper.xml

@@ -14,7 +14,7 @@
 FROM
 	(
 	SELECT
-		MD5(RAND() * 10000) sequence_nbr,
+		CONCAT('1',CEILING(RAND()*9000000000+1000000000)) sequence_nbr,
 		a.dispatch_type,
 		a.rec_date,
 		a.address,

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/WorkFlowUriEnum.java

@@ -13,12 +13,12 @@ public enum WorkFlowUriEnum {
     已执行任务有ID("已执行任务有ID", "/workflow/activitiHistory/all-historytasks?processDefinitionKey={processDefinitionKey}&userId={userId}", "processDefinitionKey,userId"),
     启动免登录流程("启动免登录流程", "/processes/{appKey}", "appKey"),
     当前节点("当前节点", "/wf/taskstodo?processInstanceId={processInstanceId}", "processInstanceId"),
-    执行流程("执行流程", "/workflow/task/pickupAndComtask/{processInstanceId}pleteTask/{taskId}", "taskId"),
+    执行流程("执行流程", "/workflow/task/pickupAndCompleteTask/{taskId}", "taskId"),
     终止流程("终止流程", "/wf/processes/{processInstanceId}?deleteReason={deleteReason}", "processInstanceId,deleteReason"),
     当前子节点("当前子节点", "/wf/processes/{processInstanceId}/tasks?taskDefinitionKey={taskDefinitionKey}", "processInstanceId,taskDefinitionKey"),
     工作流流水("工作流流水","/wf/processes/{processInstanceId}/tasks", "processInstanceId"),
     子节点信息("子节点信息","/workflow/task/list/all/{instanceId}", "instanceId"),
-    当前任务("子节点信息","/workflow/task/{processInstanceId}", "processInstanceId");
+    当前任务("当前任务","/workflow/task/{processInstanceId}", "processInstanceId");
 
     private String desc;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -192,7 +192,6 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 					o.getBizOrgCode());
 			return menu;
 		}).collect(Collectors.toList());
-		menuList.remove(null);
 		return buildTreeParallel(menuList);
 	}
 
@@ -202,7 +201,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
 		menuList.forEach(e -> map.put(e.getKey(), e));
 		Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
-		entries.parallelStream().forEach(entry -> {
+		entries.stream().forEach(entry -> {
 			OrgMenuDto value = entry.getValue();
 			if (value != null) {
 				OrgMenuDto treeDto = map.get(value.getParentId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -90,6 +90,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -1674,6 +1675,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         String taskId = null;
                 JSONObject taskJson = remoteWorkFlowService.queryTask(processInstanceId);
         if (null != taskJson) {
+            if (ValidationUtil.isEmpty(taskJson.get("data"))) {
+                return null;
+            }
             JSONObject dataJson = (JSONObject) taskJson.get("data");
             taskId = (String) dataJson.get("id");
         }