From 58d5bccddc8d7a018dd1f4957224206966d15bfc Mon Sep 17 00:00:00 2001 From: Mlin Date: Fri, 13 Jan 2023 14:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=88=97=E5=AE=9A=E5=88=B6=E5=88=97=E5=90=8D=E7=A7=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BC=98=E5=8C=9620230113?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/mapper/resource/HrmResourceMapper.java | 2 +- .../engine/organization/mapper/resource/HrmResourceMapper.xml | 1 + .../organization/service/impl/HrmResourceServiceImpl.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 274d2ece..2a05da47 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -73,7 +73,7 @@ public interface HrmResourceMapper { List queryAllResColumns(@Param("level") String level,@Param("grade") String grade); - String queryLabelName(@Param("fieldName") String fieldName); + String queryLabelName(@Param("fieldName") String fieldName,@Param("scopeId") String scopeId); } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index a74ab988..87a46f04 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -423,6 +423,7 @@ cus_formdict t2 WHERE t1.fieldid = t2.id AND t1.scope = 'HrmCustomFieldByInfoType' + and t1.SCOPEID = #{scopeId} and t2.fieldname = #{fieldName} diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index a74f8d41..a7d32c2f 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -154,9 +154,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic if (StringUtils.isNotBlank(columns)) { String[] tmp = columns.split(","); for (int i = 0; i < tmp.length; i++) { + String scopeId = tmp[i].split("_")[0]; String fieldName = tmp[i].substring(tmp[i].lastIndexOf("_") + 1); WeaTableColumn weaTableColumn = new WeaTableColumn(); - weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName)); + weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId)); weaTableColumn.setColumn(fieldName); weaTableColumn.setDisplay(WeaBoolAttr.TRUE); weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");