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

src/custom/restcontroller/system/datacollect/datacollect.java

@@ -55,7 +55,7 @@ public class datacollect extends Controller {
     }
 
     public void updateSharematerial(Long ownerid, int type) throws YosException {
-        Row row = dbConnect.runSqlQuery(0, "SELECT count(*) count from sys_datacollect WHERE ownertable='sat_sharematerial' and ownerid=" + ownerid + " and type=2 and siteid='" + siteid + "'");
+        Row row = dbConnect.runSqlQuery(0, "SELECT count(*) count from sys_datacollect WHERE ownertable='sat_sharematerial' and ownerid=" + ownerid + " and type=" + type + " and siteid='" + siteid + "'");
 
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sat_sharematerial");
         updateSQL.setSiteid(siteid);