bug更新

src/custom/restcontroller/ClientUserInfo.java

@@ -72,7 +72,7 @@ public class ClientUserInfo extends UserInfo {
         return enterprise_HrRow;
     }
 
-    public Row getAgentsRow() throws YosException {
+    public Row getAgentRow() throws YosException {
         if (agentsRow == null) {
             Rows agentsRows = controller.dbConnect.runSqlQuery("select * from sa_agents where siteid='" + getSiteId() + "' and sys_enterpriseid=" + getEnterpriseId());
             if (agentsRows.isNotEmpty()) {
@@ -82,8 +82,8 @@ public class ClientUserInfo extends UserInfo {
         return agentsRow;
     }
 
-    public long getAgentsId() throws YosException {
-        Row row = getAgentsRow();
+    public long getAgentID() throws YosException {
+        Row row = getAgentRow();
         if (row == null || row.isEmpty()) {
             return 0;
         }

src/custom/restcontroller/common/usercenter/usercenter.java

@@ -58,7 +58,7 @@ public class usercenter extends Controller {
                 userrow.put("agenthr", agenthrrow);
             }
             {
-                Row agentrow = userInfo.getAgentsRow();
+                Row agentrow = userInfo.getAgentRow();
                 userrow.put("agent", agentrow);
             }
             {

src/custom/restcontroller/sale/customer/Customer.java

@@ -932,7 +932,7 @@ public class Customer extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "我的公海池", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("hrid", hrid);
-        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentID());
         sqlFactory.addParameter_in("sa_saleareaid", userInfo.getSaleAreaIds());
         sqlFactory.addParameter("departmentid", departmentid);
         sqlFactory.addParameter_SQL("where", where);

src/custom/restcontroller/saletool/courseware/courseware.java

@@ -66,7 +66,7 @@ public class courseware extends Controller {
             sqlFactory.addParameter("changeby", username);
             sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
             sqlFactory.addParameter("createuserid", userid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             sqlFactory.addParameter("hrid", hrid);
             dbConnect.runSqlUpdate(sqlFactory);
         } else {
@@ -74,7 +74,7 @@ public class courseware extends Controller {
             sqlFactory.addParameter("siteid", siteid);
             sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
             sqlFactory.addParameter("createuserid", userid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             sqlFactory.addParameter("hrid", hrid);
             dbConnect.runSqlUpdate(sqlFactory);
         }
@@ -127,7 +127,7 @@ public class courseware extends Controller {
         ArrayList<Long> sa_saleareaids = userInfo.getSaleAreaIds();
         sa_saleareaids.add((long) 0);
         //查询条件
-        String defSql = "SELECT sat_coursewareid FROM sat_courseware_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentsId() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
+        String defSql = "SELECT sat_coursewareid FROM sat_courseware_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentID() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
         String whereSql = defSql + " AND isonlymanager = 0";
         //是否是负责人
         if (isleader) {

src/custom/restcontroller/saletool/notice/notice.java

@@ -55,7 +55,7 @@ public class notice extends Controller {
         sqlFactory.addParameter_in("departmentid", departmentid);
         sqlFactory.addParameter_in("hrid", hrid);
         sqlFactory.addParameter_in("userid", userid);
-        sqlFactory.addParameter_in("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter_in("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter_in("sa_saleareaid", userInfo.getSaleAreaIds());
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
 
@@ -85,7 +85,7 @@ public class notice extends Controller {
         sqlFactorycount.addParameter_in("departmentid", departmentid);
         sqlFactorycount.addParameter_in("userid", userid);
         sqlFactorycount.addParameter_in("hrid", hrid);
-        sqlFactorycount.addParameter_in("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactorycount.addParameter_in("sa_agentsid",  userInfo.getAgentID());
         sqlFactorycount.addParameter_in("sa_saleareaid", userInfo.getSaleAreaIds());
         Row readrow = dbConnect.runSqlQuery(0, sqlFactorycount);
         JSONObject object = new JSONObject();
@@ -160,7 +160,7 @@ public class notice extends Controller {
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter("hrid", hrid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         dbConnect.runSqlUpdate(sqlFactory);
         return getSucReturnObject().toString();
     }
@@ -191,7 +191,7 @@ public class notice extends Controller {
             sqlFactory.addParameter("sat_noticeid", sat_noticeid);
             sqlFactory.addParameter("createuserid", userid);
             sqlFactory.addParameter("hrid", hrid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             dbConnect.runSqlUpdate(sqlFactory);
         } else {
             SQLFactory sqlFactory = new SQLFactory(this, "阅读记录次数更新");
@@ -199,7 +199,7 @@ public class notice extends Controller {
             sqlFactory.addParameter("sat_noticeid", sat_noticeid);
             sqlFactory.addParameter("userid", userid);
             sqlFactory.addParameter("hrid", hrid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             dbConnect.runSqlUpdate(sqlFactory);
         }
 

src/custom/restcontroller/saletool/orderclue/web/orderclue.java

@@ -27,7 +27,6 @@ import restcontroller.webmanage.sale.enterprisefinance.EnterpriseFinance;
 import restcontroller.webmanage.saletool.orderclue.privateclue.PrivateClue;
 import restcontroller.webmanage.saletool.orderclue.publicclue.PublicClue;
 
-import javax.xml.crypto.Data;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,8 +47,8 @@ public class orderclue extends Controller {
      * @throws YosException
      */
     public ArrayList<Long> getAgentClue(Long hrid) throws YosException {
-        if ( userInfo.getAgentsId() > 0) {
-            String idsSql = "SELECT sat_orderclueid FROM sat_orderclue_auth WHERE isused AND sa_agentsid = " +  userInfo.getAgentsId() + " and siteid = '" + siteid + "'";
+        if ( userInfo.getAgentID() > 0) {
+            String idsSql = "SELECT sat_orderclueid FROM sat_orderclue_auth WHERE isused AND sa_agentsid = " +  userInfo.getAgentID() + " and siteid = '" + siteid + "'";
             if (!isleader) {
                 idsSql = idsSql + " and hrid = " + hrid;
             }
@@ -139,7 +138,7 @@ public class orderclue extends Controller {
         sqlFactory.addParameter_SQL("where2", where2);
 
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter_SQL("where", where);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);
@@ -527,8 +526,8 @@ public class orderclue extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         for (Object obj : sat_orderclueid_array) {
             Long id = Long.valueOf(obj.toString());
-            Rows rows = dbConnect.runSqlQuery("SELECT * FROM sat_orderclue_auth WHERE sat_orderclueid = " + id + " AND hrid =" + sys_enterprise_hrid + " AND sa_agentsid = " +  userInfo.getAgentsId());
-            sqlList.add("UPDATE sat_orderclue_auth SET  isused = 0 where  sat_orderclueid = " + id + " AND sa_agentsid = " +  userInfo.getAgentsId());
+            Rows rows = dbConnect.runSqlQuery("SELECT * FROM sat_orderclue_auth WHERE sat_orderclueid = " + id + " AND hrid =" + sys_enterprise_hrid + " AND sa_agentsid = " +  userInfo.getAgentID());
+            sqlList.add("UPDATE sat_orderclue_auth SET  isused = 0 where  sat_orderclueid = " + id + " AND sa_agentsid = " +  userInfo.getAgentID());
             if (rows.isEmpty()) {
                 //新增
                 sqlList.add(getAddAuthSql(id.toString(), sys_enterprise_hrid));
@@ -538,7 +537,7 @@ public class orderclue extends Controller {
                         + username + "',changedate=CURRENT_TIME,changeuserid = "
                         + userid + " WHERE sat_orderclueid = "
                         + id + " AND sa_agentsid = "
-                        +  userInfo.getAgentsId() + " AND hrid = "
+                        +  userInfo.getAgentID() + " AND hrid = "
                         + sys_enterprise_hrid);
             }
 
@@ -776,7 +775,7 @@ public class orderclue extends Controller {
         sqlFactory.addParameter("sat_orderclue_authid", createTableID("sat_orderclue_auth"));
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter("username", username);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_orderclueid", sat_orderclueid);
         sqlFactory.addParameter("hrid", sys_enterprise_hrid);
         String sql = sqlFactory.getSQL();

src/custom/restcontroller/saletool/salematerial/salematerial.java

@@ -5,13 +5,9 @@ import common.Controller;
 import common.YosException;
 import common.annotation.API;
 import common.annotation.CACHEING;
-import common.annotation.CACHEING_CLEAN;
-import common.annotation.cm;
 import common.data.Row;
 import common.data.Rows;
-import common.data.RowsMap;
 import common.data.SQLFactory;
-import restcontroller.saletool.orderclue.web.orderclue;
 
 import java.util.ArrayList;
 
@@ -46,7 +42,7 @@ public class salematerial extends Controller {
         //查询当前用户下目录是否已有授权项
         boolean isAuth = false;
         String sql = "SELECT COUNT(0) num FROM sat_salematerial_auth WHERE attachmentid in (SELECT attachmentid  FROM sys_attachment t1 WHERE t1.parentid = '"
-                + parentid + "' AND isfolder = 1) and (departmentid = " + departmentid + " OR hrid = " + hrid + " or sa_agentsid = " +  userInfo.getAgentsId() + " or sa_saleareaid in " + sa_saleareaids + " )";
+                + parentid + "' AND isfolder = 1) and (departmentid = " + departmentid + " OR hrid = " + hrid + " or sa_agentsid = " +  userInfo.getAgentID() + " or sa_saleareaid in " + sa_saleareaids + " )";
         sql = sql.replace("[", "(").replace("]", ")");
         Row row = dbConnect.runSqlQuery(0, sql);
         if (row.getLong("num") > 0) {
@@ -56,7 +52,7 @@ public class salematerial extends Controller {
         //查询条件
         String whereSql = "";
         if (isAuth) {
-            String defSql = "SELECT attachmentid FROM sat_salematerial_auth WHERE (departmentid =" + departmentid + " OR hrid =" + hrid + " OR sa_agentsid = " +  userInfo.getAgentsId() + " OR sa_saleareaid in " + sa_saleareaids + ")";
+            String defSql = "SELECT attachmentid FROM sat_salematerial_auth WHERE (departmentid =" + departmentid + " OR hrid =" + hrid + " OR sa_agentsid = " +  userInfo.getAgentID() + " OR sa_saleareaid in " + sa_saleareaids + ")";
             String temp = defSql + " AND isonlymanager = 0";
             //是否是负责人
             if (isleader) {

src/custom/restcontroller/saletool/sharematerial/sharematerial.java

@@ -49,7 +49,7 @@ public class sharematerial extends Controller {
             type = whereObject.getLongValue("type");
 
         }
-        Long sa_agentsid_temp =  userInfo.getAgentsId() == 0 ? -1 :  userInfo.getAgentsId();
+        Long sa_agentsid_temp =  userInfo.getAgentID() == 0 ? -1 :  userInfo.getAgentID();
         ArrayList<Long> sa_saleareaids = userInfo.getSaleAreaIds();
         sa_saleareaids.add((long) 0);
         //查询条件
@@ -69,7 +69,7 @@ public class sharematerial extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "素材-列表", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId() == 0 ? -1 :  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID() == 0 ? -1 :  userInfo.getAgentID());
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter_SQL("whereSql", whereSql);
         String sql = sqlFactory.getSQL();
@@ -140,7 +140,7 @@ public class sharematerial extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "素材-我的列表", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentID());
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);
 
@@ -264,7 +264,7 @@ public class sharematerial extends Controller {
             sqlFactory.addParameter("changeby", username);
             sqlFactory.addParameter("sat_sharematerialid", sat_sharematerialid);
             sqlFactory.addParameter("createuserid", userid);
-            sqlFactory.addParameter("sa_agentsid", userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid", userInfo.getAgentID());
             sqlFactory.addParameter("hrid", hrid);
             dbConnect.runSqlUpdate(sqlFactory);
         } else {
@@ -272,7 +272,7 @@ public class sharematerial extends Controller {
             sqlFactory.addParameter("siteid", siteid);
             sqlFactory.addParameter("sat_sharematerialid", sat_sharematerialid);
             sqlFactory.addParameter("createuserid", userid);
-            sqlFactory.addParameter("sa_agentsid", userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid", userInfo.getAgentID());
             sqlFactory.addParameter("hrid", hrid);
             dbConnect.runSqlUpdate(sqlFactory);
         }

src/custom/restcontroller/saletool/submitedit/submitedit.java

@@ -11,11 +11,9 @@ import common.data.Row;
 import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
-import common.data.db.DataPool;
 import restcontroller.R;
 
 import java.util.ArrayList;
-import java.util.Date;
 
 @API(title = "提报")
 public class submitedit extends Controller {
@@ -55,7 +53,7 @@ public class submitedit extends Controller {
         ArrayList<Long> sa_saleareaids = userInfo.getSaleAreaIds();
         sa_saleareaids.add((long) 0);
         //查询条件
-        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentsId() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
+        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentID() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
         String whereSql = defSql + " AND isonlymanager = 0";
 
         //是否是负责人
@@ -69,7 +67,7 @@ public class submitedit extends Controller {
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter_SQL("whereSql", whereSql);
         sqlFactory.addParameter("createuserid", userid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId() == 0 ? -1 :  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID() == 0 ? -1 :  userInfo.getAgentID());
         sqlFactory.addParameter("hrid", hrid);
         String sqlTest = sqlFactory.getSQL();
         Rows submitrows = dbConnect.runSqlQuery(sqlTest);
@@ -104,7 +102,7 @@ public class submitedit extends Controller {
         ArrayList<Long> sa_saleareaids = userInfo.getSaleAreaIds();
         sa_saleareaids.add((long) 0);
         //查询条件
-        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentsId() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
+        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentID() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
         String whereSql = defSql + " AND isonlymanager = 0";
         whereSql = whereSql.replace("[", "(").replace("]", ")");
         //是否是负责人
@@ -128,7 +126,7 @@ public class submitedit extends Controller {
     	 ArrayList<Long> sa_saleareaids = userInfo.getSaleAreaIds();
          sa_saleareaids.add((long) 0);
         //查询条件
-        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentsId() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
+        String defSql = "SELECT sat_submiteditmodelid FROM sat_submiteditmodel_auth WHERE (departmentid IN ('" + departmentid + "') OR hrid in ('" + hrid + "') OR sa_agentsid in ('" +  userInfo.getAgentID() + "') or sa_saleareaid in " + sa_saleareaids + ") ";
         String whereSql = defSql + " AND isonlymanager = 0";
         whereSql = whereSql.replace("[", "(").replace("]", ")");
         //是否是负责人
@@ -222,10 +220,10 @@ public class submitedit extends Controller {
             //查询提报明细是否存在
             Rows sqlQuery;
             //判断经销商是否存在
-            if ( userInfo.getAgentsId() == 0) {
+            if ( userInfo.getAgentID() == 0) {
                 sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditmodelid='" + sat_submiteditmodelid + "' and siteid='" + siteid + "' and hrid='" + hrid + "'");
             } else {
-                sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditmodelid='" + sat_submiteditmodelid + "' and siteid='" + siteid + "' and sa_agentsid='" +  userInfo.getAgentsId() + "'");
+                sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditmodelid='" + sat_submiteditmodelid + "' and siteid='" + siteid + "' and sa_agentsid='" +  userInfo.getAgentID() + "'");
             }
             if (!sqlQuery.isEmpty()) {
                 if (rows.getRow(0).getBoolean("onceonly")) {
@@ -244,10 +242,10 @@ public class submitedit extends Controller {
             //查询提报明细是否存在
             Rows sqlQuery;
             //判断经销商是否存在
-            if ( userInfo.getAgentsId() == 0) {
+            if ( userInfo.getAgentID() == 0) {
                 sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditid='" + sat_submiteditid + "' and siteid='" + siteid + "' and hrid='" + hrid + "'");
             } else {
-                sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditid='" + sat_submiteditid + "' and siteid='" + siteid + "' and sa_agentsid='" +  userInfo.getAgentsId() + "'");
+                sqlQuery = this.dbConnect.runSqlQuery("select sat_submiteditid,status from sat_submitedit where sat_submiteditid='" + sat_submiteditid + "' and siteid='" + siteid + "' and sa_agentsid='" +  userInfo.getAgentID() + "'");
             }
             if (sqlQuery.isEmpty()) {
                 return getErrReturnObject().setErrMsg("该提报明细不存在").toString();
@@ -266,7 +264,7 @@ public class submitedit extends Controller {
         sqlFactory.addParameter("hrid", hrid);
         sqlFactory.addParameter("createdepid", departmentid);
         sqlFactory.addParameter("authdepid", departmentid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("authuserid", userid);
         sqlFactory.addParameter("changeuserid", userid);
@@ -343,7 +341,7 @@ public class submitedit extends Controller {
     public String selectdetailssubmit() throws YosException {
         long sat_submiteditmodelid = content.getLongValue("sat_submiteditmodelid");
         SQLFactory sqlFactory = new SQLFactory(this, "查询具体经销商提报");
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_submiteditmodelid", sat_submiteditmodelid);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);

src/custom/restcontroller/webmanage/sale/recyclebin/RecycleBin.java

@@ -170,7 +170,7 @@ public class RecycleBin extends Controller {
             Rows userRows = dbConnect.runSqlQuery("SELECT userid FROM sys_enterprise_hr t1 INNER JOIN sa_agents t2 ON t2.sys_enterpriseid=t1.sys_enterpriseid WHERE t2.siteid='" + siteid + "' and t2.sa_agentsid in " + replace);
             ArrayList<String> useridlist = userRows.toArrayList("userid");
             {
-                SQLFactory deletesql = new SQLFactory("sql:delete from sa_agents where siteid='" + siteid + "' and sa_agentsid=" +  userInfo.getAgentsId());
+                SQLFactory deletesql = new SQLFactory("sql:delete from sa_agents where siteid='" + siteid + "' and sa_agentsid=" +  userInfo.getAgentID());
                 sqlList.add(deletesql.getSQL());
             }
             {

src/custom/restcontroller/webmanage/saletool/courseware/statistics/agent.java

@@ -55,7 +55,7 @@ public class agent extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询已学习的经销商成员账号");
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -90,7 +90,7 @@ public class agent extends Controller {
             sqlFactory = new SQLFactory(this, "已学习的经销商列表");
         }
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -105,7 +105,7 @@ public class agent extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询已下载的经销商成员账号");
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -143,7 +143,7 @@ public class agent extends Controller {
         }
 
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);

src/custom/restcontroller/webmanage/saletool/notice/notice.java

@@ -558,7 +558,7 @@ public class notice extends Controller {
             sqlFactory.addParameter("sat_noticeid", sat_noticeid);
             sqlFactory.addParameter("createuserid", userid);
             sqlFactory.addParameter("hrid", hrid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             dbConnect.runSqlUpdate(sqlFactory);
         } else {
             SQLFactory sqlFactory = new SQLFactory(this, "阅读记录次数更新");
@@ -566,7 +566,7 @@ public class notice extends Controller {
             sqlFactory.addParameter("sat_noticeid", sat_noticeid);
             sqlFactory.addParameter("userid", userid);
             sqlFactory.addParameter("hrid", hrid);
-            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+            sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
             dbConnect.runSqlUpdate(sqlFactory);
         }
     }

src/custom/restcontroller/webmanage/saletool/notice/statistics/agent.java

@@ -109,7 +109,7 @@ public class agent extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询已学习的经销商成员账号");
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -144,7 +144,7 @@ public class agent extends Controller {
             sqlFactory = new SQLFactory(this, "已学习的经销商列表");
         }
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -159,7 +159,7 @@ public class agent extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询已下载的经销商成员账号");
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         String sql = sqlFactory.getSQL();
         Rows studyRows = dbConnect.runSqlQuery(sql);
@@ -197,7 +197,7 @@ public class agent extends Controller {
         }
 
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);
@@ -215,7 +215,7 @@ public class agent extends Controller {
         }
 
         sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid",  userInfo.getAgentID());
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);

src/custom/restcontroller/webmanage/saletool/sharematerial/sharematerial.java

@@ -16,7 +16,6 @@ import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
 import restcontroller.R;
-import utility.email.EmailContent;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -67,7 +66,7 @@ public class sharematerial extends Controller {
         sqlFactory.addParameter("notes", notes);
         sqlFactory.addParameter("canfiledownload", canfiledownload);
 //        sqlFactory.addParameter("tag", tagArray.toJSONString());
-        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentsId());
+        sqlFactory.addParameter("sa_agentsid", userInfo.getAgentID());
 
         ArrayList<String> list = (ArrayList<String>) JSONObject.parseArray(tagArray.toJSONString(), String.class);
         DataTag.updateTag(this, "sat_sharematerial", sat_sharematerialid, list);