Merge remote-tracking branch 'origin/master'

src/main/java/com/yihu/ehr/basic/user/controller/UserEndPoint.java

@@ -1171,6 +1171,7 @@ public class UserEndPoint extends EnvelopRestEndPoint {
        try {
            // 帐户:手机号，身份证号,登录账号
            List<User> users = userService.getUserForLogin(userName);
            List<MUser> mUsers=new ArrayList<>();
            if (users != null) {
                User user = users.get(0);
                String path = getImgPathByFileResource(users.get(0).getImgRemotePath());
@@ -1206,7 +1207,8 @@ public class UserEndPoint extends EnvelopRestEndPoint {
                    }
                    userModel.setRole(buffer.substring(0, buffer.length() - 1));
                }
                envelop.setObj(userModel);
                mUsers.add(userModel);
                envelop.setObj(mUsers);
            } else {
                envelop.setSuccessFlg(false);
                envelop.setErrorMsg("该账号不存在，请确认或联系管理员！");