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

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

@@ -130,7 +130,7 @@ public class DesignPic extends Controller {
         }
 
         QuerySQL attachmentQuery = SQLFactory.createQuerySQL(this, "sys_attachment_links").setTableAlias("t1");
-        attachmentQuery.setSiteid(detailRow.getString("siteid"));
+        attachmentQuery.setSiteid(siteid);
         attachmentQuery.setWhere("ownertable", ownertable);
         attachmentQuery.setWhere("ownerid", sat_sharematerialid);
         attachmentQuery.setWhere("usetype", ownertable);