yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yili:5bdf6a89dd8f5cf927414be91665bc7e33790728
Branches Tags
yili:master
yili:apps_dev
yili:apps_4_test
yili:apps_dev_ydq_portal_home
yili:apps_dev_ydq_portal_process
yili:apps_dev_ydq_portal_person
yili:apps_dev_ydq_sjdb
yili:apps_dev_ydq_portal_dept
yili:apps_zhaolei_dev
yili:apps_dev_ydq_process_list
yili:apps_dev_ydq_oa_dyAndYy
yili:apps_dev_CEO_whitelist
yili:apps_dev_ydq_freedom
yili:app_4_test
yili:dev
yili:datamigration-word
..
compare: yili:754582b20366ece42fa3dd74f4b919b730eddd53
Branches Tags
yili:apps_dev
yili:apps_4_test
yili:apps_dev_ydq_portal_home
yili:apps_dev_ydq_portal_process
yili:apps_dev_ydq_portal_person
yili:apps_dev_ydq_sjdb
yili:apps_dev_ydq_portal_dept
yili:apps_zhaolei_dev
yili:apps_dev_ydq_process_list
yili:apps_dev_ydq_oa_dyAndYy
yili:apps_dev_CEO_whitelist
yili:apps_dev_ydq_freedom
yili:app_4_test
yili:master
yili:dev
yili:datamigration-word

No commits in common. "5bdf6a89dd8f5cf927414be91665bc7e33790728" and "754582b20366ece42fa3dd74f4b919b730eddd53" have entirely different histories.
5bdf6a89dd ... 754582b203

1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
com.awspaas.user.apps.nqms.portal.view.person/src/com/awspaas/user/apps/nqms/portal/view/person/service/PersonService.java
View File

@ -258,7 +258,7 @@ public class PersonService {
if (StringUtils.isNotEmpty(propertyValue)) { if (StringUtils.isNotEmpty(propertyValue)) {
try { try {
JSONObject jsonObject = JSONObject.parseObject(propertyValue); JSONObject jsonObject = JSONObject.parseObject(propertyValue);
String relationShapeId = jsonObject.getString("relationFileId"); String relationShapeId = jsonObject.getString("relationShapeId");
if (StringUtils.isNotEmpty(relationShapeId)) { if (StringUtils.isNotEmpty(relationShapeId)) {
xgPerformanceIds.addAll(Arrays.asList(relationShapeId.split(","))); xgPerformanceIds.addAll(Arrays.asList(relationShapeId.split(",")));
} }
@ -280,7 +280,7 @@ public class PersonService {
List<BO> kpiBos = SDK.getBOAPI().query("BO_EU_PORTAL_PERSON_KPI").list(); List<BO> kpiBos = SDK.getBOAPI().query("BO_EU_PORTAL_PERSON_KPI").list();
if (kpiBos.size() > 0) { if (kpiBos.size() > 0) {
for (BO bo : kpiBos) { for (BO bo : kpiBos) {
if (xgPerformanceIds.contains(bo.getString("FILE_ID"))) { if (xgPerformanceIds.contains(bo.getString("KPI_IP"))) {
xgPerformance++; xgPerformance++;
} }
} }
@ -987,7 +987,7 @@ public class PersonService {
if (StringUtils.isNotEmpty(propertyValue)) { if (StringUtils.isNotEmpty(propertyValue)) {
try { try {
JSONObject jsonObject = JSONObject.parseObject(propertyValue); JSONObject jsonObject = JSONObject.parseObject(propertyValue);
String relationShapeId = jsonObject.getString("relationFileId"); String relationShapeId = jsonObject.getString("relationShapeId");
if (StringUtils.isNotEmpty(relationShapeId)) { if (StringUtils.isNotEmpty(relationShapeId)) {
xgPerformanceIds.addAll(Arrays.asList(relationShapeId.split(","))); xgPerformanceIds.addAll(Arrays.asList(relationShapeId.split(",")));
} }
@ -1006,7 +1006,7 @@ public class PersonService {
return resultBos; return resultBos;
} }
for (BO bo : bos) { for (BO bo : bos) {
if (xgPerformanceIds.contains(bo.getString("FILE_ID"))) { if (xgPerformanceIds.contains(bo.getString("KPI_IP"))) {
resultBos.add(bo.toJSONObject()); resultBos.add(bo.toJSONObject());
} }
} }