From d0551146ec90f23b38dc10becfa5b961e347d620 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 27 Nov 2019 15:51:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E8=A7=A3=E7=BB=91=E6=97=A7=E5=B8=90=E6=88=B7?= =?UTF-8?q?=E5=86=8D=E7=BB=91=E5=AE=9A=E6=96=B0=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/SysUserServiceImpl.java | 10 ++++++++++ .../com/elink/esua/epdc/controller/AuthController.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 954de6d52..2952e9ba1 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -221,6 +221,16 @@ public class SysUserServiceImpl extends BaseServiceImpl result = authService.workLogin(workUserLoginDto.getUsername(), workUserLoginDto.getPassword()); if (result.success()) { - // 更新用户openId + // 解绑上一次登录账户并绑定当前账户 SysUserOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(workUserLoginDto, SysUserOpenIdFormDTO.class); authService.modifyOpenId(sysUserOpenIdFormDto); } From 717365711af7f4ccdd9989d1f4e307418fdd5137 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 27 Nov 2019 15:57:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/EpdcAppTemplateInfoResultDTO.java | 25 ++++++++++--------- .../controller/AppMenuTemplateController.java | 1 - .../src/main/resources/mapper/AppMenuDao.xml | 12 ++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java index 28e52958f..cdc96f8b9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java @@ -13,25 +13,21 @@ import java.io.Serializable; public class EpdcAppTemplateInfoResultDTO implements Serializable { private static final long serialVersionUID = -5608333958115132353L; - /** - * 是否渐变色（0否，1是） - */ - private String gradationFlag; /** * 背景色（渐变色为0时使用） */ private String backgroundColor; - /** - * 开始色（渐变色为1时使用） - */ - private String startColor; + /** + * CSS类名 + */ + private String className; - /** - * 终止色（渐变色为1时使用） - */ - private String endColor; + /** + * 备用CSS类名 + */ + private String spareClassName; /** * 标签颜色 @@ -42,4 +38,9 @@ public class EpdcAppTemplateInfoResultDTO implements Serializable { * 模板编码(tmp-1,tmp-2,tmp-3) */ private String templateCode; + + /** + * 模块列数 + */ + private Integer columnAmount; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java index c122c04e2..f70b1cdf9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java @@ -18,7 +18,6 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml index c2ae287fe..d562e9cda 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml @@ -71,10 +71,10 @@ - + - - + + @@ -89,10 +89,10 @@