1.扫码登录时不考虑输入的用户名和密码。

2.扫码时按照更新时间降序查找openId。

picc-common/src/main/resources/mapper/base/CompanyUser.xml

@@ -129,7 +129,7 @@ id_,user_name,password_,phone_,open_id,profession_,summary_,company_id,status_,c
 		select *
 		from base_company_user
 		where open_id=#{0} and del_flag=0
-		order by create_time asc limit 1
+		order by update_time desc limit 1
 	</select>
 	<select id="findByCompanyId" resultMap="CompanyUserMap">
 		select *

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/UserController.java

@@ -234,9 +234,7 @@ public class UserController {
             DES3 des3 = new DES3();
 
             //如果请求过微信登录则，当前openId在redis就值
-            if (
-                StringUtils.isEmpty(userName) && StringUtils.isEmpty(password)
-             && StringUtils.isNotEmpty(openId) && valueOperations.get("LOGIN_" + openId)!=null) {
+            if (StringUtils.isNotEmpty(openId) && valueOperations.get("LOGIN_" + openId)!=null) {
                 CompanyUser companyUser = companyUserService.findByOpenId(openId);
 
                 if(companyUser!=null) {

weixin-middleware/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>weixin-middleware</artifactId>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <properties>
         <swagger2.version>2.7.0</swagger2.version>