owl-cli 6.150.0 → 6.152.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -45,14 +45,15 @@ function checklogin() {
|
|
|
45
45
|
return env;
|
|
46
46
|
|
|
47
47
|
} else {
|
|
48
|
+
var params = JSON.parse($body);
|
|
48
49
|
var isid = SessionService.getSessionId(request);
|
|
49
50
|
var now = new Date().getTime();
|
|
50
51
|
var sessionId = 'owl_backend_session_' + isid;
|
|
51
52
|
var session = owl_backend_sessionService.get(sessionId);
|
|
52
53
|
if (session && session.lastModified > now - 7 * 24 * 3600 * 1000) {
|
|
53
54
|
var loginUserId = session.userId
|
|
54
|
-
var roleId = session.roleId;
|
|
55
|
-
var orgId = session.orgId;
|
|
55
|
+
var roleId = params.rroleId || session.roleId;
|
|
56
|
+
var orgId = params.rorgId || session.orgId;
|
|
56
57
|
var orgIds = [orgId].concat(getParentOrgIds(orgId));
|
|
57
58
|
if (loginUserId) {
|
|
58
59
|
var loginUser = owl_mall_uService.get(loginUserId);
|
|
@@ -43,14 +43,20 @@ function buildSort(sort){
|
|
|
43
43
|
|
|
44
44
|
var env = checklogin();
|
|
45
45
|
if(!env){
|
|
46
|
+
var ret = {
|
|
47
|
+
state:'err',
|
|
48
|
+
msg:'没有登录。'
|
|
49
|
+
}
|
|
50
|
+
out.print(JSON.stringify(ret));
|
|
46
51
|
return;
|
|
47
52
|
}
|
|
53
|
+
var params = JSON.parse($body);
|
|
48
54
|
|
|
49
55
|
var shopId = env.shopId;
|
|
50
56
|
var warehouseId = env.warehouseId;
|
|
51
57
|
var loginId = env.loginId;
|
|
52
|
-
var roleId = env.roleId;
|
|
53
|
-
var orgId = env.orgId;
|
|
58
|
+
var roleId = params.rroleId || env.roleId;
|
|
59
|
+
var orgId = params.rorgId || env.orgId;
|
|
54
60
|
var spec = @spec;
|
|
55
61
|
var meta = spec['#meta'];
|
|
56
62
|
var tableId = 'owl_' + spec._t;
|
|
@@ -59,7 +65,7 @@ function buildSort(sort){
|
|
|
59
65
|
///////////////////////////////
|
|
60
66
|
|
|
61
67
|
//判断是subplatform,还是shop,还是platform
|
|
62
|
-
|
|
68
|
+
|
|
63
69
|
var searchArgs = params.searchArgs;
|
|
64
70
|
var keyword = searchArgs.keyword;
|
|
65
71
|
var pageSize = params.pageSize;
|