eganwu пре 1 година
родитељ
комит
ae2ef17e41

+ 3 - 1
src/custom/restcontroller/webmanage/saletool/award/AwardItems.java

@@ -179,7 +179,9 @@ public class AwardItems extends Controller {
             row.put("max", firstnumber + row.getInteger("outcount"));
             firstnumber = firstnumber + row.getInteger("outcount");
         }
-
+        if (max == 0) {
+            return getErrReturnObject().setErrMsg("未中奖").toString();
+        }
         int number = getNumber(1, max);
         Long sa_awarditemsid = 0L;
         for (Row row : rows) {

+ 2 - 0
src/custom/restcontroller/webmanage/users/visitors.java

@@ -89,6 +89,8 @@ public class visitors extends Controller {
         row.put("areaname", StringUtils.join(areaRows.toArray("areaname"), ","));
         row.put("sys_enterpriseid",sys_enterpriseid);
 
+        row.put("enterprise_hr",userInfo.getEnterprise_HrRow());
+
         return getSucReturnObject().setData(row).toString();
     }