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

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

@@ -254,7 +254,7 @@ public class LongPicText extends Controller {
         attachmentQuery.setWhere("ownerid", sat_sharematerialid);
         attachmentQuery.setWhere("usetype", ownertable);
         if (detailRow.getString("title").equals("6C红人服务")) {
-            Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
+//            Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
             attachmentQuery.setWhere("t1.attachmentid in(SELECT attachmentid from sys_attachment_links WHERE isonsale=1 and siteid='" + siteid + "' and  ownerid='" + sys_enterpriseid + "' and ownertable ='sys_enterprise' and usetype='sys_enterprise')");
         }
         attachmentQuery.setOrderBy("t1.sequence");