修复OA微信推送消息回调地址跳转类型为空问题

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/MceRequestVO.java

@@ -91,11 +91,6 @@ public class MceRequestVO  extends BaseEntity {
      */
     String oaType;
 
-    /**
-     * 实例Id
-     */
-    String instanceId;
-
     @Override
     public String toString() {
         ObjectMapper objectMapper = new ObjectMapper();

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceContentServiceImpl.java

@@ -116,9 +116,6 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             if (StringUtils.isNotEmpty(mceReceiveVO.getOaType())) {
                 sendWeChatMessageRequestVO.setOaType(mceReceiveVO.getOaType());
             }
-            if (StringUtils.isNotEmpty(mceReceiveVO.getInstanceId())) {
-                sendWeChatMessageRequestVO.setInstanceId(mceReceiveVO.getInstanceId());
-            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceMbuserServiceImpl.java

@@ -79,8 +79,6 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         String infoType = requestVO.getInfoType();
         String infoTypeName = requestVO.getInfoTypeName();
         String oaType = requestVO.getOaType();
-        String instanceId = requestVO.getInstanceId();
-
         // access_token时效校验，判断获取access_token获取时间是否超过有效时间，超过就调用更新，保证一直有效
         if (!redisHelper.hasKey("access_key")) {
             redisHelper.set("access_time", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -193,10 +191,9 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         }
 
         log.info("oaType：{}",oaType);
-        log.info("instanceId：{}",instanceId);
         // 回调地址
         if ("3".equals(requestVO.getInfoType())) {
-            tUrl = String.format(constant.WE_CHAT_CUSTOMER_CALL_URL3, infoType, infoTypeName, infoId, oaType, instanceId);
+            tUrl = String.format(constant.WE_CHAT_CUSTOMER_CALL_URL3, infoType, infoTypeName, infoId, oaType);
         } else if (Objects.nonNull(infoTypeName)) {
             tUrl = String.format(constant.WE_CHAT_CUSTOMER_CALL_URL, infoType, infoTypeName, infoId);
         } else {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -709,6 +709,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         mceRequestVO.setProcessName(json.get("processName").toString());
         mceRequestVO.setApprovalNode(json.get("approvalNode").toString());
         mceRequestVO.setRealName(json.get("realName").toString());
+        mceRequestVO.setOaType(json.get("oaType").toString());
         addMceReceive(mceRequestVO);
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SendWeChatMessageRequestVO.java

@@ -79,9 +79,4 @@ public class SendWeChatMessageRequestVO {
      * oa跳转类型 (todo我的待办、me我发起的、copy抄送我的)
      */
     String oaType;
-
-    /**
-     * 实例Id
-     */
-    String instanceId;
 }