Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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

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;

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<SysUserDao, SysUserEntit
 
     @Override
     public Result modifyOpenIdByUsername(SysUserOpenIdFormDTO sysUserOpenIdFormDto) {
+        // 查询当前openId是否绑定过账户
+        SysUserDTO userDto = this.getSysUserInfoByOpenId(sysUserOpenIdFormDto.getOpenId());
+        if (null != userDto) {
+            // 解绑旧帐户
+            SysUserEntity entity = new SysUserEntity();
+            entity.setId(userDto.getId());
+            entity.setOpenId("");
+            baseDao.updateById(entity);
+        }
+        // 绑定新账户
         baseDao.updateOpenIdByUsername(sysUserOpenIdFormDto);
 
         return new Result();

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml

@@ -71,10 +71,10 @@
     <resultMap id="EpdcIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO">
         <id column="mainLable" property="mainLable"/>
         <association property="templateInfo" javaType="com.elink.esua.epdc.dto.epdc.result.EpdcAppTemplateInfoResultDTO" >
-            <result column="gradationFlag" property="gradationFlag"/>
+            <result column="columnAmount" property="columnAmount"/>
             <result column="backgroundColor" property="backgroundColor"/>
-            <result column="startColor" property="startColor"/>
-            <result column="endColor" property="endColor"/>
+            <result column="className" property="className"/>
+            <result column="spareClassName" property="spareClassName"/>
             <result column="lableColor" property="lableColor"/>
             <result column="templateCode" property="templateCode"/>
         </association>
@@ -89,10 +89,10 @@
     <select id="indexPanelByMobile" resultMap="EpdcIndexPanelResultDTOMap">
         SELECT
             lp.field_value AS mainLable,
-            t.GRADATION_FLAG AS gradationFlag,
+            t.COLUMN_AMOUNT AS columnAmount,
             t.BACKGROUND_COLOR AS backgroundColor,
-            t.START_COLOR AS startColor,
-            t.END_COLOR AS endColor,
+            t.CLASS_NAME AS className,
+            t.SPARE_CLASS_NAME AS spareClassName,
             t.LABLE_COLOR AS lableColor,
             t.TEMPLATE_CODE AS templateCode,
             lc.field_value AS lable,

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java

@@ -119,7 +119,7 @@ public class AuthController {
         ValidatorUtils.validateEntity(workUserLoginDto);
         Result<WorkUserAuthorizationDTO> result = authService.workLogin(workUserLoginDto.getUsername(), workUserLoginDto.getPassword());
         if (result.success()) {
-            // 更新用户openId
+            // 解绑上一次登录账户并绑定当前账户
             SysUserOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(workUserLoginDto, SysUserOpenIdFormDTO.class);
             authService.modifyOpenId(sysUserOpenIdFormDto);
         }