合并分支 'fix_foton_20230613' 到 'master'

add:去除#/

查看合并请求 laws-foton-slrs/foton-wkflow-rest!58

src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java

@@ -247,6 +247,13 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         head.setPASSWORD("TEST_oa201611241710");
         head.setSRVLEVEL("1");
         List<Object> list = new ArrayList<>();
+        notifyTodoSendContexts.forEach(each -> {
+            if (each.getLink()!= null){
+                if (each.getLink().contains("#/")){
+                    each.setLink(each.getLink().replaceAll("#/",""));
+                }
+            }
+        });
         list.addAll(notifyTodoSendContexts);
         jsonSend.setHEAD(head);
         jsonSend.setLIST(list);
@@ -311,6 +318,11 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
     @Override
     @Async
     public NotifyTodoAppResult setTodoDone(NotifyTodoSendContext notifyTodoSendContext) throws Exception{
+        if (notifyTodoSendContext.getLink()!= null){
+            if (notifyTodoSendContext.getLink().contains("#/")){
+                notifyTodoSendContext.setLink(notifyTodoSendContext.getLink().replaceAll("#/",""));
+            }
+        }
         NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult();
         String result = "";
         SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
@@ -359,6 +371,11 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
     @Override
     @Async
     public NotifyTodoAppResult sendTodo(BusProcessNew busProcessNew) throws Exception{
+        if (busProcessNew.getLink()!= null){
+            if (busProcessNew.getLink().contains("#/")){
+                busProcessNew.setLink(busProcessNew.getLink().replaceAll("#/",""));
+            }
+        }
         NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult();
         String result = "";
         SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");