Merge remote-tracking branch 'remotes/origin/dev' into test

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;
                 }
             }

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<SysOrganize> organizeList;
+
+    @Transient
+    @ApiParam(value ="账号所有操作部门 Id 集合")
+    private List<String> departmentIdList;
     
     @Transient
     @ApiParam(value ="账号所有操作部门信息")