From bb9444fc9113def379a9d47c71b8b0d654233a7d Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 26 Dec 2018 21:28:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 47dd135..59baf96 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -40,18 +40,6 @@ public class SessionUser implements Serializable { @ApiParam("用户对象信息") private SysUserInfo userInfo; - @ApiParam("主要组织信息") - private SysOrganize organize; - - @ApiParam("主要组织集合") - private List organizeList; - - @ApiParam("主要部门信息") - private SysDepartment department; - - @ApiParam("主要部门集合") - private List departmentList; - public SessionUser() { } 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 19050c4..80dedea 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 @@ -119,6 +119,14 @@ public class SysUser extends BaseBean { /********************************** 非数据库信息 ********************************/ @Transient + @ApiParam(value ="用户部门信息") + private SysDepartment department; + + @Transient + @ApiParam(value ="用户组织信息") + private SysOrganize organize; + + @Transient @ApiParam(value ="账号所有操作组织信息") private List organizeList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 17cf947..68ba901 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -201,7 +201,7 @@ public class SysUserInfo extends BaseBean { private List organizeList; @Transient - @ApiParam(value ="用户岗位信息") + @ApiParam(value ="用户部门信息") private SysDepartment department; @Transient From a5e05ef36efa74d99272cc73f7f95f48fd3b1acf Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 27 Dec 2018 13:42:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E5=9C=A8=E8=B0=83=E7=BB=84=E4=BB=B6=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=AF=B9=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=9A=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA30=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E9=AA=8C=E8=AF=81=EF=BC=8C=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E4=B8=BAprompt=E7=9A=84=E4=B8=8D=E7=94=A8=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d2270cb..7bd9a7a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1446,7 +1446,8 @@ public class WmsEnumUtil { public enum ACTION_MOUDULE_PARAM_TYPE { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), - STRING(20, "字符串"); + STRING(20, "字符串"), + OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; private String description;