查询合作商户子账号列表添加主账号

src/dsb/com/cnd3b/restcontroller/customer/tagents/SQL/经销商账号列表查询_主账号.sql

@@ -0,0 +1,2 @@
+select tenterprise_userid,t1.fname,t1.frole,t1.fphonenumber,t1.fisused,t1.fisadministrator from tenterprise_users t1
+where t1.siteid=$siteid$ and t1.tagentsid=$tagentsid$ and t1.fisadministrator=1 and t1.fusertype='¾­ÏúÉÌ' AND frole = '¹ÜÀíÔ±'

src/dsb/com/cnd3b/restcontroller/customer/tagents/tagents.java

@@ -330,7 +330,17 @@ public class tagents extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "¾­ÏúÉÌÕ˺ÅÁбí²éѯ");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("tagentsid", tagentsid);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        String sql = sqlFactory.getSQL();
+        Rows rows = dbConnect.runSqlQuery(sql);
+        if (content.containsKey("hasAdministrator") && "1".equals(content.getString("hasAdministrator"))) {
+            SQLFactory factory = new SQLFactory(this, "¾­ÏúÉÌÕ˺ÅÁбí²éѯ_Ö÷Õ˺Å");
+            factory.addParameter("siteid", siteid);
+            factory.addParameter("tagentsid", tagentsid);
+            Rows tempRows = dbConnect.runSqlQuery(factory.getSQL());
+            if(!tempRows.isEmpty()){
+                rows.add(0,tempRows.get(0));
+            }
+        }
 
         RowsMap attinfosMap = getAttachmentUrl("tenterprise_users", rows.toArrayList("tenterprise_userid"), "headportrait");
         for (Row row : rows) {