# Conflicts:

#	suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java
#	suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

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

@@ -158,11 +158,35 @@ public class SysUser extends BaseEntity
     //公司名称
     private String companyName;
 
+
+    /** 所属组织名称 */
+    private String orgName;
+
+    /** 雇员id */
+    private String sapEmployeeId;
+
+
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
    //门店对应关系
     private List<Map<String,Object> >loginTypeInfo;
 
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getSapEmployeeId() {
+        return sapEmployeeId;
+    }
+
+    public void setSapEmployeeId(String sapEmployeeId) {
+        this.sapEmployeeId = sapEmployeeId;
+    }
+
     public void setLoginTypeInfo(List<Map<String, Object>> loginTypeInfo) {
         this.loginTypeInfo = loginTypeInfo;
     }

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -59,6 +59,22 @@ public interface SysUserMapper
      */
     public SysUser selectUserByLoginName(String userName);
 
+    /**
+     * 通过用户名与用户类型查询用户-立邦员工
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByTypeOne(String userName);
+
+    /**
+     * 通过用户名与用户类型查询用户-经销商
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByTypeTwo(String userName);
+
     public List<String> selectUserByIsManager(@Param("isCustomerManager") Integer isCustomerManager);
 
     /**

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -65,6 +65,15 @@ public interface ISysUserService
     public SysUser selectUserByLoginName(String userName);
 
 
+    /**
+     * 通过用户名与用户类型查询用户
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByLoginNameAndType(String userName,String userType);
+
+
     public List<String> selectUserByIsManager(Integer isCustomerManager);
 
 

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

@@ -123,6 +123,17 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserByLoginName(userName);
     }
 
+    @Override
+    public SysUser selectUserByLoginNameAndType(String userName, String userType) {
+        if ("0".equals(userType)){
+            return userMapper.selectUserByTypeOne(userName);
+        }else if ("1".equals(userType)){
+            return userMapper.selectUserByTypeTwo(userName);
+        }else {
+           return userMapper.selectUserByLoginName(userName);
+        }
+    }
+
     @Override
     public List<String> selectUserByIsManager(Integer isCustomerManager) {
         return userMapper.selectUserByIsManager(isCustomerManager);

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

@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="subOfficeName"       column="subOffice_name"       />
 		<result property="subOfficeCode"       column="subOffice_code"       />
 		<result property="companyName"       column="sales_company_name"       />
+		<result property="orgName"    column="org_name"    />
+		<result property="sapEmployeeId"    column="sap_employee_id"    />
 		<result property="isConsignee"       column="is_consignee"       />
 		<result property="isIndependently"  column="is_independently" />
 		<result property="isSelfDelivery" column="is_self_delivery" />
@@ -228,6 +230,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
 	</select>
 
+	<select id="selectUserByTypeOne" parameterType="String" resultMap="SysUserResult">
+		select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
+				u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
+				c.company_name,u.quit,u.is_shop_account,
+				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
+		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 sys_user_shop_ext shop  on u.user_id = shop.user_id
+		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
+	</select>
+
+	<select id="selectUserByTypeTwo" parameterType="String" resultMap="SysUserResult">
+		select  u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.status,
+				u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.is_consignee,u.person_attestation_time,u.is_independently,u.is_self_delivery,is_sync,
+				c.company_name,u.quit,u.is_shop_account,
+				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,org.sales_group_name as subOffice_name,org.sales_company_name,org.sales_office_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 org on org.CustomerCode = suse.customer_code
+		where u.login_name = #{userName} and u.quit is null and u.del_flag ='0' GROUP BY login_name
+	</select>
+
 	<select id="selectUserByIsManager"  resultType="java.lang.String">
 		select  u.login_name
 		from sys_user u

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -96,6 +96,7 @@ public class WxController extends ApiBaseController {
     @PostMapping("getWxUserInfo")
     public Object getWxUserInfo(){
         ParameterObject obj =  getParameterObject();
+        logger.info("获取用户微信信息开始{}", JSON.toJSON(obj));
         obj.checkParameterNotNull("code");
         String code = obj.getString("code");
         JSONObject json = new JSONObject();
@@ -110,7 +111,12 @@ public class WxController extends ApiBaseController {
         }
         userId = json.getString("UserId");
         log.info("当前企业用户登录名称："+userId);
-        SysUser user = sysUserService.selectUserByLoginName(userId);
+        SysUser user = new SysUser();
+        if (obj.contaonsKey("userType")){
+            user = sysUserService.selectUserByLoginNameAndType(userId,obj.getString("userType"));
+        }else {
+            user = sysUserService.selectUserByLoginName(userId);
+        }
         List<Map<String, Object>> result = new ArrayList<>();
         List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label shopType,dict_value shopTypeValue  from sys_dict_data where  dict_type='system_login_type'  ");
         if(user==null){
@@ -520,10 +526,16 @@ public class WxController extends ApiBaseController {
     @PostMapping("/getUserByPassWord")
     public Object getUserByPassWord() {
         ParameterObject obj = getParameterObject();
+        logger.info("收到登录参数：{}",JSON.toJSON( obj));
         obj.checkParameterNotNull("username,password");
         String username = obj.getString("username");
         String password = obj.getString("password");
-        SysUser user = sysUserService.selectUserByLoginName(username);
+        SysUser user = new SysUser();
+        if (obj.contaonsKey("userType")){
+            user = sysUserService.selectUserByLoginNameAndType(username,obj.getString("userType"));
+        }else {
+            user = sysUserService.selectUserByLoginName(username);
+        }
         if (user == null) {
             return AjaxResult.error(302, "查无此人");
         }