|
@@ -368,7 +368,7 @@ public class WebClientRest {
|
|
|
//登陆时,如果验证码验证成功,但是手机号未注册过,则自动进行注册!
|
|
|
if (connect.runSqlQuery("select * from tenterprise_users where fisused=1 and fphonenumber='" + phonenumber + "'").isEmpty()) {
|
|
|
Users users = new Users(requestcontent);
|
|
|
- users.register_usersByLogin(phonenumber,parameter.defultsiteid);
|
|
|
+ users.register_usersByLogin(phonenumber, parameter.defultsiteid);
|
|
|
isnewregister = 1;
|
|
|
}
|
|
|
}
|
|
@@ -380,10 +380,19 @@ public class WebClientRest {
|
|
|
ArrayList<String> tokensaveList = new ArrayList<>();
|
|
|
for (Row row : rows) {
|
|
|
long userid = row.getLong("userid");
|
|
|
+ String siteid = row.getString("siteid");
|
|
|
String usertoken = new Encryption().Encode_MD5(phonenumber + password + userid + Calendar.getInstance().getTimeInMillis());
|
|
|
row.put("token", usertoken);
|
|
|
row.put("logintime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime()));
|
|
|
row.put("isnewregister", isnewregister);
|
|
|
+
|
|
|
+ SQLFactory headportraitSQL = new SQLFactory("附件查询_类型");
|
|
|
+ headportraitSQL.addParameter("ownertable", "tenterprise_users");
|
|
|
+ headportraitSQL.addParameter_in("ownerid", userid);
|
|
|
+ headportraitSQL.addParameter("siteid", siteid);
|
|
|
+ headportraitSQL.addParameter("ftype", "headportrait");
|
|
|
+ row.put("attinfos", headportraitSQL.runSqlQuery());
|
|
|
+
|
|
|
parameter.userIdList.put(userid, row);
|
|
|
parameter.tokenlist.put(usertoken, userid);
|
|
|
|