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

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -282,8 +282,10 @@ public class promotionItems extends Controller {
 
     //查询发货单列表
     public QuerySQL queryPromotionItemList(String where,long sa_promotionid,long sa_promotion_itemgroupid) throws YosException {
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_promotion_items");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_promotion_items","sa_promotion_itemsid", "siteid","sa_promotionid","itemid","itemid","orderminqty","orderaddqty","saledqty","islimit","isonsale","sa_promotion_itemgroupid","groupqty","signaturecode");
         querySQL.setTableAlias("t1");
+
+
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid = t2.itemid and t1.siteid = t2.siteid",
                 "itemno", "itemname","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t2.unitid = t3.unitid and t2.siteid = t3.siteid", "unitname");
@@ -313,6 +315,7 @@ public class promotionItems extends Controller {
         querySQL.addQueryFields("price5", "ifnull(t8.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid5", "ifnull(t8.sa_promotion_itempriceid, 0)");
 
+
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.sa_promotionid",sa_promotionid);
         querySQL.setWhere("t1.sa_promotion_itemgroupid",sa_promotion_itemgroupid);

src/custom/restcontroller/webmanage/users/users.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.users;
 
+import beans.datacontrllog.DataContrlLog;
 import beans.parameter.Parameter;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -206,6 +207,7 @@ public class users extends Controller {
             sqllist.addAll(createUserFactory.getSQL());
             changeuserid = createUserFactory.getUserid();
             content.put("userid", changeuserid);
+            sqllist.add(DataContrlLog.createLog(this,"sys_users",changeuserid,"新增","新增用户成功").getSQL());
         } else {
             if (accountno.isEmpty()) {
                 return getErrReturnObject().setErrMsg("账号不能为空").toString();
@@ -224,6 +226,8 @@ public class users extends Controller {
 //            sqlFactory.addParameter("accountno", accountno);
             sqllist.add(sqlFactory.getSQL());
 
+            sqllist.add(DataContrlLog.createLog(this,"sys_users",changeuserid,"编辑","编辑用户成功").getSQL());
+
             for (Long roleid : roleidslist) {
                 SQLFactory rolesqlFactory = new SQLFactory(this, "账号角色添加");
                 rolesqlFactory.addParameter("userid", changeuserid);
@@ -299,8 +303,10 @@ public class users extends Controller {
         boolean isactive = content.getBoolean("isactive");
         if (isactive) {
             dbConnect.runSqlUpdate("update sys_users set status='ACTIVE',failedlogins=0 where userid='" + userid + "'");
+            DataContrlLog.createLog(this,"sys_users",userid,"启用","启用成功").insert();
         } else {
             dbConnect.runSqlUpdate("update sys_users set status='INACTIVE' where userid='" + userid + "'");
+            DataContrlLog.createLog(this,"sys_users",userid,"停用","停用成功").insert();
             loguserout(userid);
         }
         return query_userMain();
@@ -319,6 +325,7 @@ public class users extends Controller {
             return getErrReturnObject().setErrMsg("未设置站点默认密码").toString();
         }
         dbConnect.runSqlUpdate("update sys_users set password='" + rows.get(0).getString("password_default") + "' where userid='" + userid + "'");
+        DataContrlLog.createLog(this,"sys_users",userid,"密码重置","密码重置成功").insert();
         loguserout(userid);
         return getSucReturnObject().toString();
     }
@@ -376,6 +383,7 @@ public class users extends Controller {
         String sql = sqlFactory.getSQL();
         dbConnect.runSqlUpdate(sql);
         for (Object o : userids) {
+            DataContrlLog.createLog(this,"sys_users",Long.parseLong(String.valueOf(o)),"删除","删除成功").insert();
             loguserout(Long.parseLong(String.valueOf(o)));
         }
         return getSucReturnObject().toString();