埋点管理需要增加一个服务商代码字段

suishenbang-system/src/main/java/com/dgtly/system/domain/SysMagnetLog.java

@@ -49,7 +49,18 @@ public class SysMagnetLog extends BaseEntity
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    public void setId(Long id) 
+    /** 服务商code */
+    private String shopCode;
+
+    public String getShopCode() {
+        return shopCode;
+    }
+
+    public void setShopCode(String shopCode) {
+        this.shopCode = shopCode;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -142,6 +142,17 @@ public class SysUser extends BaseEntity
     //2离职
     private String quit;
 
+    /** 服务商编码 */
+    private String shopCode;
+
+    public String getShopCode() {
+        return shopCode;
+    }
+
+    public void setShopCode(String shopCode) {
+        this.shopCode = shopCode;
+    }
+
     public String getQuit(){return  quit;}
 
     public  void setQuit(String quit){this.quit=quit;}

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysMagnetLogServiceImpl.java

@@ -2,6 +2,10 @@ package com.dgtly.system.service.impl;
 
 import java.util.List;
 import com.dgtly.common.utils.DateUtils;
+import com.dgtly.system.domain.SysUser;
+import com.dgtly.system.domain.SysUserExt;
+import com.dgtly.system.mapper.SysUserExtMapper;
+import com.dgtly.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.system.mapper.SysMagnetLogMapper;
@@ -21,6 +25,9 @@ public class SysMagnetLogServiceImpl implements ISysMagnetLogService
     @Autowired
     private SysMagnetLogMapper sysMagnetLogMapper;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
     /**
      * 查询磁铁日志
      * 
@@ -55,6 +62,8 @@ public class SysMagnetLogServiceImpl implements ISysMagnetLogService
     public int insertSysMagnetLog(SysMagnetLog sysMagnetLog)
     {
         sysMagnetLog.setCreateTime(DateUtils.getNowDate());
+        SysUser userInfo = userMapper.selectUserById(sysMagnetLog.getUserId());
+        sysMagnetLog.setShopCode(userInfo.getShopCode());
         return sysMagnetLogMapper.insertSysMagnetLog(sysMagnetLog);
     }
 

suishenbang-system/src/main/resources/mapper/system/SysMagnetLogMapper.xml

@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="shopCode"    column="shop_code"    />
     </resultMap>
 
     <sql id="selectSysMagnetLogVo">
-        select id, user_id, user_name, org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time from sys_magnet_log
+        select id, user_id, user_name, org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time,shop_code from sys_magnet_log
     </sql>
 
     <select id="selectSysMagnetLogList" parameterType="SysMagnetLog" resultMap="SysMagnetLogResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
             <if test="updateTime != null ">update_time,</if>
+            <if test="shopCode != null ">shop_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null ">#{userId},</if>
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null ">#{updateTime},</if>
+            <if test="shopCode != null ">#{shopCode},</if>
          </trim>
     </insert>
 

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="personAttestationTime"       column="person_attestation_time"       />
 		<result property="isOrgAuthentication"       column="is_org_authentication"       />
 		<result property="orgAttestationTime"       column="org_attestation_time"       />
+		<result property="shopCode"    column="shop_code"    />
         <!--<result property="salesLevel"   column="sales_level"  />-->
         <!--<result property="orgName"      column="org_name"     />-->
         <!--<result property="orgCode"      column="org_code"     />-->
@@ -95,13 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
        		    suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-       		    suse.post_name,suse.post_code,suse.identity
+       		    suse.post_name,suse.post_code,suse.identity,sush.shop_code
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 			 left join sys_user_ext suse on suse.user_id = u.user_id
+             left join sys_user_shop_ext sush on u.login_name = sush.login_name
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">