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

src/custom/restcontroller/webmanage/sale/agents/agents.java

@@ -131,6 +131,7 @@ public class agents extends Controller {
                 ArrayList<Long> userids = DataTeam.queryTeamRow(this, "sa_customers", id).toArrayList("userid", new ArrayList<>());
                 Executor.sendEml(this, "customers_agent_add", id, siteid, userids);
             }
+            sqllist.add(DataContrlLog.createLog(this,"sa_agents",sa_agentsid,"新增","新增经销商").getSQL());
         } else {
             if (rows.isNotEmpty()) {
                 if (rows.get(0).getLong("sa_agentsid") != sa_agentsid || rows.get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
@@ -138,6 +139,7 @@ public class agents extends Controller {
                 }
             }
             sqlFactory = new SQLFactory(this, "经销商修改");
+            sqllist.add(DataContrlLog.createLog(this,"sa_agents",sa_agentsid,"编辑","编辑经销商").getSQL());
         }
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("sa_agentsid", sa_agentsid);
@@ -275,8 +277,10 @@ public class agents extends Controller {
                 Long sa_customersid = customersRows.get(0).getLong("sa_customersid");
                 if (status.equals("启用")) {
                     DataTag.createTag(this, "sa_customers", sa_customersid, "经销商");
+                    sqllist.add(DataContrlLog.createLog(this,"sa_agents",sa_agentsid,"启用","启用经销商").getSQL());
                 } else {
                     DataTag.deleteTag(this, "sa_customers", sa_customersid, "经销商");
+                    sqllist.add(DataContrlLog.createLog(this,"sa_agents",sa_agentsid,"禁用","禁用经销商").getSQL());
                 }
             }
         }