1

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

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         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,
+        		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,
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 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_ext suse on suse.user_id = u.user_id and suse.del_flag='0'
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">

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

@@ -490,6 +490,7 @@ public class WxController extends ApiBaseController {
         obj.checkParameterNotNull("username,password");
         String username = obj.getString("username");
         String password = obj.getString("password");
+        String type=obj.getString("type");
         SysUser user = sysUserService.selectUserByLoginName(username);
         if(user==null){
             return AjaxResult.error(302,"查无此人");