sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-04-29 00:18:52 +08:00
parent 72b976a06d
commit 95d0df9c64
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -279,7 +279,7 @@ export default {
this.onOpen = true; this.onOpen = true;
this.title = options.procDefName; this.title = options.procDefName;
//初始化流程类型 //初始化流程类型
if (options.category == "9") { if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
this.fbAptitude = true; this.fbAptitude = true;
} }
this.initFormDate(options.procInsId); this.initFormDate(options.procInsId);

2
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -294,7 +294,7 @@ export default {
this.deptName = store.getters.dept.deptName; this.deptName = store.getters.dept.deptName;
this.nickName = store.getters.name; this.nickName = store.getters.name;
//初始化流程类型 //初始化流程类型
if (options.category == "9") { if (options.procDefKey == "flow_fbzzsp_fbszzsp") {
this.fbAptitude = true; this.fbAptitude = true;
} }
const self = this; const self = this;

2
ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java → ruoyi-wechat/src/main/java/com/ruoyi/web/common/WxPublicsController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@RequestMapping("/wechat/publics") @RequestMapping("/wechat/publics")
public class PublicsController { public class WxPublicsController {
/** /**
* 查询演训类型 * 查询演训类型

3
ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java
View File

@ -79,8 +79,7 @@ public class WechatUserLoginController extends BaseController {
String key="wechat_openIdLogin-"+loginBody.getOpenId(); String key="wechat_openIdLogin-"+loginBody.getOpenId();
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
data = (Map<String,Object>) obj; ajax.put("data",obj);
ajax.put("data",data);
return ajax; return ajax;
} }
data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId()); data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId());