Merge remote-tracking branch 'origin/4.0' into 4.0

smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/login/LoginHelper.java

@@ -47,7 +47,7 @@ public class LoginHelper {
         }
 
         //查询数据库
-        List<User> userObjList = DbEngine.getInstance().findDao(User.ENTITY_NAME).queryWhere(" sur_code=? or sur_tel=?", loginPO.getUsername(), loginPO.getUsername());
+        List<User> userObjList = DbEngine.getInstance().findDao(User.ENTITY_NAME).queryWhere(" sur_nicky=? or sur_tel=?", new Object[]{loginPO.getUsername(), loginPO.getUsername()});
 //        User user = UserCache.getInstance().getByKey(loginPO.getUsername());
         if (null == userObjList || userObjList.size() <= 0) {
             throw new BizException("账号或者密码出错");