Compare commits

...

2 Commits

Author SHA1 Message Date
袁东强
5bdf6a89dd Merge branch 'apps_dev_ydq_portal_person' into apps_4_test 2025-09-29 20:38:10 +08:00
袁东强
bdcc5028c0 调整获取绩效相关逻辑 2025-09-29 20:27:04 +08:00

View File

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