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

Compare commits

base: sxyanzhu:414794eee3596107173cf9d07d3cc1cba6817b23
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:14ae81bc79633f7df5178a9556c5c594c9c2a761
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "414794eee3596107173cf9d07d3cc1cba6817b23" and "14ae81bc79633f7df5178a9556c5c594c9c2a761" have entirely different histories.
414794eee3 ... 14ae81bc79

4 changed files with 5 additions and 4 deletions
Show Stats 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.procDefKey == "flow_fbzzsp_fbszzsp") { if (options.category == "9") {
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.procDefKey == "flow_fbzzsp_fbszzsp") { if (options.category == "9") {
this.fbAptitude = true; this.fbAptitude = true;
} }
const self = this; const self = this;

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

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

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

@ -79,7 +79,8 @@ 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){
ajax.put("data",obj); data = (Map<String,Object>) obj;
ajax.put("data",data);
return ajax; return ajax;
} }
data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId()); data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId());