|
@@ -309,7 +309,7 @@ public class tagents extends Controller {
|
|
|
SQLFactory sql = new SQLFactory(this, "合作经销商详情查询");
|
|
|
sql.addParameter("siteid", siteid);
|
|
|
sql.addParameter("tcooperationagentsid", content.getString("tagentsid"));
|
|
|
- sql.addParameter("tagentsid",tagentsid);
|
|
|
+ sql.addParameter("tagentsid", tagentsid);
|
|
|
sql.addParameter_SQL("orderby", " t2.changedate DESC,t1.changedate DESC");
|
|
|
Rows rows = dbConnect.runSqlQuery(sql.getSQL());
|
|
|
for (Row row : rows) {
|
|
@@ -320,9 +320,9 @@ public class tagents extends Controller {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询合作商户子账号列表
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
public String query_CooperationAgentUsers() {
|
|
@@ -332,13 +332,13 @@ public class tagents extends Controller {
|
|
|
sqlFactory.addParameter("tagentsid", tagentsid);
|
|
|
String sql = sqlFactory.getSQL();
|
|
|
Rows rows = dbConnect.runSqlQuery(sql);
|
|
|
- if (content.containsKey("hasAdministrator") && "1".equals(content.getString("hasAdministrator"))) {
|
|
|
+ if (content.getBooleanValue("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));
|
|
|
+ if (!tempRows.isEmpty()) {
|
|
|
+ rows.add(0, tempRows.get(0));
|
|
|
}
|
|
|
}
|
|
|
|