修改字段返回

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

@@ -146,6 +146,10 @@ public class SysUser extends BaseEntity
     //门店账号标识 1门店账号 0非门店账号
     private String  isShopAccount;
 
+    private String officeName;
+
+    private String subOfficeName;
+
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
    //门店对应关系
@@ -214,7 +218,21 @@ public class SysUser extends BaseEntity
         return isSelfDelivery;
     }
 
+    public String getOfficeName() {
+        return officeName;
+    }
+
+    public void setOfficeName(String officeName) {
+        this.officeName = officeName;
+    }
+
+    public String getSubOfficeName() {
+        return subOfficeName;
+    }
 
+    public void setSubOfficeName(String subOfficeName) {
+        this.subOfficeName = subOfficeName;
+    }
 
     public void setIsSelfDelivery(String isSelfDelivery) {
         this.isSelfDelivery = isSelfDelivery;

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

@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
+		<result property="officeName"       column="sales_office_name"       />
+		<result property="subOfficeName"       column="sales_group_name"       />
 		<result property="isConsignee"       column="is_consignee"       />
 		<result property="isIndependently"  column="is_independently" />
 		<result property="isSelfDelivery" column="is_self_delivery" />
@@ -96,13 +98,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,cust.sales_office_name,cust.sales_office_name ,cust.sales_group_name
 		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  and suse.del_flag = '0'
+			 left join data_master_customer cust on cust.CustomerCode = suse.customer_code
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">