bug修复

src/custom/restcontroller/webmanage/saletool/award/AwardItems.java

@@ -258,7 +258,7 @@ public class AwardItems extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_awardmx")
                 .setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sa_award", "t2", "t2.sa_awardid=t2.sa_awardid and t2.siteid=t1.siteid");
+        querySQL.addJoinTable(JOINTYPE.inner, "sa_award", "t2", "t2.sa_awardid=t1.sa_awardid and t2.siteid=t1.siteid");
         querySQL.addQueryFields("addressdetail", "concat(province,city,county,address)");
         querySQL.addQueryFields("awardheadname", "t2.name");
         querySQL.setSiteid(siteid);

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

@@ -65,7 +65,7 @@ public class EquipmentResourceLibrary extends Controller {
 
             sqlFactory.insert();
             content.put("sat_sharematerialid", sat_sharematerialid);
-            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建资料 " + content.getString("title")).insert();
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "新建", "新建资料 " + content.getStringValue("title")).insert();
         } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(this, sat_sharematerial);
             sqlFactory.setUniqueid(sat_sharematerialid);
@@ -82,7 +82,7 @@ public class EquipmentResourceLibrary extends Controller {
             sqlFactory.setValue("candownload_c", content.getBooleanValue("candownload_c"));
             sqlFactory.setValue("ispicture", content.getBooleanValue("ispicture"));
             sqlFactory.update();
-            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑资料 " + content.getString("title")).insert();
+            DataContrlLog.createLog(this, "sat_sharematerial", sat_sharematerialid, "编辑", "编辑资料 " + content.getStringValue("title")).insert();
         }
         return detail();
     }