From 9e25ba658c4fd7acde6002fcd878c022a7bfc63a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 3 Nov 2021 21:33:15 +0800 Subject: [PATCH] =?UTF-8?q?employeePosts=20=E5=8F=82=E6=95=B0=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E8=BD=AC=E6=8D=A2=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=EF=BC=8C=E9=80=97=E5=8F=B7=E5=88=86=E9=9A=94=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/sys/db/InitCoreData.java | 2 +- .../java/com/jeesite/modules/sys/entity/Employee.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index 947bf5e3..3fc6c4ff 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -380,7 +380,7 @@ public class InitCoreData extends BaseInitDataTests { entity.setUserRoleString(val); return true; }else if ("employee.employeePosts".equals(header)){ - entity.getEmployee().setEmployeePosts(new String[]{val}); + entity.getEmployee().setEmployeePosts(val); return true; } } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java index 7122d10e..af946161 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java @@ -145,13 +145,14 @@ public class Employee extends DataEntity { this.employeePostList = employeePostList; } - public String[] getEmployeePosts() { + public String getEmployeePosts() { List list = ListUtils.extractToList(employeePostList, "postCode"); - return list.toArray(new String[list.size()]); + return StringUtils.join(list, ","); } - public void setEmployeePosts(String[] employeePosts) { - for (String val : employeePosts){ + public void setEmployeePosts(String employeePosts) { + String[] list = StringUtils.split(employeePosts, ","); + for (String val : list){ if (StringUtils.isNotBlank(val)){ EmployeePost e = new EmployeePost(); e.setPostCode(val);