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

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/teammsg.java

@@ -54,6 +54,38 @@ public class teammsg extends Controller {
         return getSucReturnObject().setData(rows).saveToDataPool().toString();
     }
 
+    /**
+     * 查询合作商户子账号列表
+     * @return
+     */
+    public String query_subUserList() {
+        String tagentsid = content.getString("tagentsid");
+        SQLFactory sqlFactory = new SQLFactory(this, "经销商账号列表查询");
+        sqlFactory.addParameter("siteid", siteid);
+        sqlFactory.addParameter("tagentsid", tagentsid);
+        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+
+        SQLFactory subusersql = new SQLFactory(this, "下级账号查询");
+        subusersql.addParameter("siteid", siteid);
+        subusersql.addParameter_in("fparentid", rows.toArrayList("tenterprise_userid"));
+
+        RowsMap map = dbConnect.runSqlQuery(subusersql.getSQL()).toRowsMap("fparentid");
+
+        RowsMap attinfosMap = getAttachmentUrl("tenterprise_users", rows.toArrayList("tenterprise_userid"), "headportrait");
+        for (Row row : rows) {
+            String tenterprise_userid = row.getString("tenterprise_userid");
+            Rows subuserrows = map.get(tenterprise_userid);
+            String[] subusers = subuserrows.toArray("tenterprise_userid");
+            row.put("subusers", subusers);
+            for (Row subuserrow : subuserrows) {
+                subuserrow.put("attinfos", attinfosMap.get(subuserrow.getString("tenterprise_userid")));
+            }
+            row.put("subusermsgs", subuserrows);
+            row.put("attinfos", attinfosMap.get(tenterprise_userid));
+        }
+        return getSucReturnObject().setData(rows).saveToDataPool().toString();
+    }
+
     /**
      * 经销商账号信息修改
      *