# Conflicts:

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

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -439,6 +439,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         System.out.println("解析DIY-事业部部门不一致情况原/新"+sysUser.getSysUserExt().getPostCode()+"/"+userExt.getPostCode());
                         SysUserRole role=new SysUserRole();
                         role.setUserId(sysUser.getUserId());
+                        role.setRoleId(user.getRoleIds()[0]);
                         userRoleMapper.deleteUserRoleInfo(role);
                         user.setUserId(sysUser.getUserId());
                         insertUserRole(user);

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

@@ -162,6 +162,9 @@ public class SysUser extends BaseEntity
     /** 雇员id */
     private String sapEmployeeId;
 
+    /** 是否刷新供应商标识*/
+    private String isRefreshProvider;
+
 
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
@@ -237,6 +240,14 @@ public class SysUser extends BaseEntity
         this.authorType = authorType;
     }
 
+    public String getIsRefreshProvider() {
+        return isRefreshProvider;
+    }
+
+    public void setIsRefreshProvider(String isRefreshProvider) {
+        this.isRefreshProvider = isRefreshProvider;
+    }
+
     //    /** 所属销售组织等级 详见字典（sales_level） */
 //    private String salesLevel;
 //

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="subOfficeCode"       column="subOffice_code"       />
 		<result property="companyName"       column="sales_company_name"       />
 		<result property="sapEmployeeId"    column="sap_employee_id"    />
+		<result property="isRefreshProvider"    column="isRefreshProvider"    />
 		<result property="isConsignee"       column="is_consignee"       />
 		<result property="isIndependently"  column="is_independently" />
 		<result property="isSelfDelivery" column="is_self_delivery" />
@@ -101,7 +102,7 @@ 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.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-				suse.post_name,suse.post_code,suse.identity,sub.subOffice_code,sub.subOffice_name,sub.sales_company_name,sub.sales_office_name,sub.sap_employee_id
+				suse.post_name,suse.post_code,suse.identity,sub.subOffice_code,sub.subOffice_name,sub.sales_company_name,sub.sales_office_name,sub.sap_employee_id,sub.isRefreshProvider
 		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