Skip to content

高东东-金蝶建发 / jf-yzj-resume

Go to a project
Commit 1b90275a by --local
Options

update: [1]基于人员属性中的"人员板块"字段确定人员归属物业shr还是放开shr 

[2] 调整orgType的定义:1 房产 2 物业
parent ffc3e385
Inline Side-by-side
Showing with 35 additions and 8 deletions
src/js/index.js
...@@ -18,6 +18,8 @@ const FastClick = require('fastclick'); ...@@ -18,6 +18,8 @@ const FastClick = require('fastclick');
// shr员工编号字段 // shr员工编号字段
const employeenumberField = process.env.PACK_ENV === 'product' ? '5893b734-4537-4036-9f1c-16ff831b64b2' : '72f1d584-bc3d-4616-85d0-4a67c1829d1c'; const employeenumberField = process.env.PACK_ENV === 'product' ? '5893b734-4537-4036-9f1c-16ff831b64b2' : '72f1d584-bc3d-4616-85d0-4a67c1829d1c';
// shr员工类型： 房开、物业、合诚
var orgTypeField = process.env.PACK_ENV === 'product' ? '20791150-9fbd-4db0-96b7-82d301c6531c' : '2cd7a5eb-371d-4d32-8220-6ebb64a5b214'
window.topHeight = 115; window.topHeight = 115;
...@@ -120,10 +122,14 @@ function getUserInfoByOid(oId) { ...@@ -120,10 +122,14 @@ function getUserInfoByOid(oId) {
const employeenumberInfo = extra.filter(({ publicid }) => { const employeenumberInfo = extra.filter(({ publicid }) => {
return employeenumberField === publicid; return employeenumberField === publicid;
}); });
var orgTypeInfo = extra.filter(function (item) {
return orgTypeField === item.publicid
})
resolve({ resolve({
uid: userInfo.username || '', uid: userInfo.username || '',
avatar: userInfo.avatar || '', avatar: userInfo.avatar || '',
employeenumber: (employeenumberInfo[0] || {}).value employeenumber: (employeenumberInfo[0] || {}).value,
orgType: (orgTypeInfo[0] || {}).value
}); });
}; };
opt.error = function(e) { opt.error = function(e) {
...@@ -142,6 +148,11 @@ function initUser() { ...@@ -142,6 +148,11 @@ function initUser() {
// 如果不是从人员详情过来的，employeenumber、uid从当前人员的获取。 // 如果不是从人员详情过来的，employeenumber、uid从当前人员的获取。
return Promise.all([app.getUser(), getUserInfoByOid(openId)]) return Promise.all([app.getUser(), getUserInfoByOid(openId)])
.then(([user, viewee]) => { .then(([user, viewee]) => {
if (user.orgType) {
user.extra = {
orgType: user.orgType
}
}
// user 查看者 // user 查看者
// viewee 被查看者 // viewee 被查看者
console.log('user:', user); console.log('user:', user);
...@@ -154,10 +165,14 @@ function initUser() { ...@@ -154,10 +165,14 @@ function initUser() {
const extra = { const extra = {
avatar: viewee.avatar, avatar: viewee.avatar,
employeenumber: viewee.employeenumber, employeenumber: viewee.employeenumber,
uid: viewee.uid, uid: viewee.uid
extra: '{"orgType": 1}'
}; };
loginuserid = user.employeenumber; loginuserid = user.employeenumber;
if (viewee.orgType) {
extra.extra = {
orgType: viewee.orgType
}
}
userid = isFromPersonDetail ? extra.employeenumber : user.employeenumber; userid = isFromPersonDetail ? extra.employeenumber : user.employeenumber;
_uid = isFromPersonDetail ? extra.uid : user.uid; _uid = isFromPersonDetail ? extra.uid : user.uid;
photoUrl = isFromPersonDetail ? extra.avatar : user.avatar; photoUrl = isFromPersonDetail ? extra.avatar : user.avatar;
...@@ -166,6 +181,8 @@ function initUser() { ...@@ -166,6 +181,8 @@ function initUser() {
} }
token = user.ssoToken; token = user.ssoToken;
appKey = extra.appkey || configuration.appkey; appKey = extra.appkey || configuration.appkey;
/* old-code
let orgType;
if (!extra.extra) { if (!extra.extra) {
orgType = eval('(' + user.extra + ')').orgType; orgType = eval('(' + user.extra + ')').orgType;
} else { } else {
...@@ -173,12 +190,17 @@ function initUser() { ...@@ -173,12 +190,17 @@ function initUser() {
eval('(' + extra.extra + ')').orgType || eval('(' + extra.extra + ')').orgType ||
eval('(' + user.extra + ')').orgType; eval('(' + user.extra + ')').orgType;
} }
*/
const _extra = extra.extra || user.extra || {}
const orgType = '' + _extra.orgType
// 2024-08-08 黄延龄反馈：1是房开 2是物业 合诚待定
// 将物业（原来是6）调整为2，原来是2的怡家园调整为6
switch (orgType) { switch (orgType) {
// 房产 // 房产
case 1: case '1':
break; break;
// 怡家园 // 怡家园
case 2: case '6':
$mas.config({ $mas.config({
baseUrl: configuration.baseUrl, baseUrl: configuration.baseUrl,
code: configuration.yjyCode code: configuration.yjyCode
...@@ -188,7 +210,7 @@ function initUser() { ...@@ -188,7 +210,7 @@ function initUser() {
_uid = _uid.replace('YJY', ''); _uid = _uid.replace('YJY', '');
break; break;
// 汇嘉 // 汇嘉
case 3: case '3':
$mas.config({ $mas.config({
baseUrl: configuration.baseUrl, baseUrl: configuration.baseUrl,
code: configuration.hjCode code: configuration.hjCode
...@@ -196,7 +218,7 @@ function initUser() { ...@@ -196,7 +218,7 @@ function initUser() {
url = configuration.methods.hjResume; url = configuration.methods.hjResume;
break; break;
// 物业 // 物业
case 6: case '2':
$mas.config({ $mas.config({
baseUrl: configuration.baseUrl, baseUrl: configuration.baseUrl,
code: configuration.wyCode code: configuration.wyCode
...@@ -204,7 +226,7 @@ function initUser() { ...@@ -204,7 +226,7 @@ function initUser() {
url = configuration.methods.wyResume; url = configuration.methods.wyResume;
break; break;
// 合诚 // 合诚
case 7: case '7':
$mas.config({ $mas.config({
baseUrl: configuration.baseUrl, baseUrl: configuration.baseUrl,
code: configuration.hcCode code: configuration.hcCode
......
src/js/polyfill/cordova.js
...@@ -336,6 +336,7 @@ ...@@ -336,6 +336,7 @@
getUser: function (param, successFn, failFn) { getUser: function (param, successFn, failFn) {
// shr员工编号字段 // shr员工编号字段
var employeenumberField = process.env.PACK_ENV === 'product' ? '5893b734-4537-4036-9f1c-16ff831b64b2' : '72f1d584-bc3d-4616-85d0-4a67c1829d1c' var employeenumberField = process.env.PACK_ENV === 'product' ? '5893b734-4537-4036-9f1c-16ff831b64b2' : '72f1d584-bc3d-4616-85d0-4a67c1829d1c'
var orgTypeField = process.env.PACK_ENV === 'product' ? '20791150-9fbd-4db0-96b7-82d301c6531c' : '2cd7a5eb-371d-4d32-8220-6ebb64a5b214'
getCurrentUserInfo(function (result) { getCurrentUserInfo(function (result) {
console.log('getCurrentUserInfo-success>>',result); console.log('getCurrentUserInfo-success>>',result);
var success = (result || {}).success var success = (result || {}).success
...@@ -350,8 +351,12 @@ ...@@ -350,8 +351,12 @@
var employeenumberInfo = extra.filter(function (item) { var employeenumberInfo = extra.filter(function (item) {
return employeenumberField === item.publicid return employeenumberField === item.publicid
}) })
var orgTypeInfo = extra.filter(function (item) {
return orgTypeField === item.publicid
})
successFn({ successFn({
employeenumber: (employeenumberInfo[0] || {}).value, employeenumber: (employeenumberInfo[0] || {}).value,
orgType: (orgTypeInfo[0] || {}).value,
uid: userInfo.username, uid: userInfo.username,
email: userInfo.email, email: userInfo.email,
avatar: userInfo.avatar, avatar: userInfo.avatar,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment