Compare commits

..

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

4 changed files with 5 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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