|
|
@@ -1137,6 +1137,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
//如果数据list大小相同,则存在重复
|
|
|
if (list.size() == hpUserList.size() && list.size() != 0) {
|
|
|
returnMap.put("userList", list);
|
|
|
+ returnMap.put("currentUser", hpUser1);
|
|
|
returnMap.put("success", "2009");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -1565,10 +1566,8 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
hpUser.setAccessTokenEndtime(access_token_endtime);
|
|
|
this.save(hpUser);
|
|
|
if (list2.size() == hpUserList.size() && list2.size() != 0) {
|
|
|
- Map map = new HashMap();
|
|
|
- map.put("currentUser", hpUser);
|
|
|
- list2.add(map);
|
|
|
returnMap.put("userList", list2);
|
|
|
+ returnMap.put("currentUser", hpUser);
|
|
|
returnMap.put("success", "2009");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -1817,9 +1816,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
hpUser.setAccessTokenEndtime(access_token_endtime);
|
|
|
this.save(hpUser);
|
|
|
if (list2.size() == hpUserList.size() && list2.size() != 0) {
|
|
|
- Map map = new HashMap();
|
|
|
- map.put("currentUser", hpUser);
|
|
|
- list2.add(map);
|
|
|
+ returnMap.put("currentUser", hpUser);
|
|
|
returnMap.put("userList", list2);
|
|
|
returnMap.put("success", "2009");
|
|
|
return returnMap;
|
|
|
@@ -2100,9 +2097,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
hpUser1.setLoginTime(new Date());
|
|
|
this.save(hpUser1);
|
|
|
if (list2.size() == hpUserList.size() && list2.size() != 0) {
|
|
|
- Map map = new HashMap();
|
|
|
- map.put("currentUser", hpUser1);
|
|
|
- list2.add(map);
|
|
|
+ returnMap.put("currentUser", hpUser1);
|
|
|
returnMap.put("userList", list2);
|
|
|
returnMap.put("success", "2009");
|
|
|
return returnMap;
|
|
|
@@ -2334,9 +2329,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
hpUser.setMinaSessionKey(sessionKey);
|
|
|
this.save(hpUser);
|
|
|
if (list2.size() == hpUserList.size() && list2.size() != 0) {
|
|
|
- Map map = new HashMap();
|
|
|
- map.put("currentUser", hpUser);
|
|
|
- list2.add(map);
|
|
|
+ returnMap.put("currentUser", hpUser);
|
|
|
returnMap.put("userList", list2);
|
|
|
returnMap.put("success", "2009");
|
|
|
return returnMap;
|