提交代码

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);

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;

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 {
 
     /**
      * 查询演训类型

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());