|
|
@@ -54,9 +54,15 @@ public class team extends Controller {
|
|
|
|
|
|
RowsMap attinfosmap = getAttachmentUrl("sys_users", hrrows.toArrayList("userid", new ArrayList<>()));
|
|
|
for (Row row : hrrows) {
|
|
|
- row.put("roleids", roleRolesMap.get(row.getString("userid")).toArray("roleid", new Long[]{}));
|
|
|
- row.put("rolenames", roleRolesMap.get(row.getString("userid")).toArray("rolename"));
|
|
|
- row.put("attinfos", attinfosmap.get(row.getString("userid")));
|
|
|
+ String userid = row.getString("userid");
|
|
|
+ if (roleRolesMap.get(userid).isNotEmpty()) {
|
|
|
+ row.put("roleids", roleRolesMap.get(userid).get(0).getLong("roleid"));
|
|
|
+ row.put("rolenames", roleRolesMap.get(userid).get(0).getLong("rolename"));
|
|
|
+ } else {
|
|
|
+ row.put("roleids", "");
|
|
|
+ row.put("rolenames", "");
|
|
|
+ }
|
|
|
+ row.put("attinfos", attinfosmap.get(userid));
|
|
|
}
|
|
|
return getSucReturnObject().setData(hrrows).toString();
|
|
|
}
|