From 609c1557d3a66692e78245d0ddf9b7802e0619d1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 29 Dec 2018 17:46:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 4bca2ed..64e12e9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -835,26 +835,26 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_CONFIG_VALUE_TYPE { - STRING(1,"text","文本值"), - NUMBER(2,"number","数字值"), - DATE(3,"date","时间值"), - BOOLEAN(4,"switch","布尔值"), - SELECT(5,"select","多选值"); + STRING("1","text","文本值"), + NUMBER("2","number","数字值"), + DATE("3","date","时间值"), + BOOLEAN("4","switch","布尔值"), + SELECT("5","select","多选值"); - private int value; + private String value; private String name; private String description; SYS_CONFIG_VALUE_TYPE() { } - SYS_CONFIG_VALUE_TYPE(int value, String name, String description) { + SYS_CONFIG_VALUE_TYPE(String value, String name, String description) { this.value = value; this.name = name; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -869,7 +869,7 @@ public class ImppEnumUtil { public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].name; } } @@ -879,7 +879,7 @@ public class ImppEnumUtil { public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } From 5241d272799eb65f82f12769f6a3eda3d00f15da Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 2 Jan 2019 14:29:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 80dedea..2a5df60 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -129,6 +129,10 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="账号所有操作组织信息") private List organizeList; + + @Transient + @ApiParam(value ="账号所有操作部门 Id 集合") + private List departmentIdList; @Transient @ApiParam(value ="账号所有操作部门信息")