From 95d0df9c647efc29ae1a3d3781cdb173c3c20816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 29 Apr 2024 00:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue  | 2 +-
 ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue  | 2 +-
 .../{PublicsController.java => WxPublicsController.java}       | 2 +-
 .../web/userLogin/controller/WechatUserLoginController.java    | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename ruoyi-wechat/src/main/java/com/ruoyi/web/common/{PublicsController.java => WxPublicsController.java} (95%)

diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
index 0d0f44b9..0c10f609 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
@@ -279,7 +279,7 @@ export default {
       this.onOpen = true;
       this.title = options.procDefName;
       //初始化流程类型
-      if (options.category == "9") {
+      if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
         this.fbAptitude = true;
       }
       this.initFormDate(options.procInsId);
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
index f29da7bd..878f22ac 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
@@ -294,7 +294,7 @@ export default {
       this.deptName = store.getters.dept.deptName;
       this.nickName = store.getters.name;
       //初始化流程类型
-      if (options.category == "9") {
+      if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
         this.fbAptitude = true;
       }
       const self = this;
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/WxPublicsController.java
similarity index 95%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/common/WxPublicsController.java
index 55d6f225..b6395676 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/WxPublicsController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/wechat/publics")
-public class PublicsController {
+public class WxPublicsController {
 
     /**
      * 查询演训类型
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java
index 5adb0a78..fbea86a9 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java
@@ -79,8 +79,7 @@ public class WechatUserLoginController extends BaseController {
         String key="wechat_openIdLogin-"+loginBody.getOpenId();
         Object obj=redisCache.getCacheObject(key);
         if(obj!=null){
-            data = (Map<String,Object>) obj;
-            ajax.put("data",data);
+            ajax.put("data",obj);
             return ajax;
         }
         data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId());