Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -444,7 +444,7 @@ public class GoodsLogic {
             String name ="";
             for (String s : split) {
                 AdminCompany adminCompany = adminCompanyService.getById(s);
-                name = name+adminCompany.getAdminCompanyId()+",";
+                name = name+adminCompany.getAdminCompanyName()+",";
 
                 GoodsCompany goodsCompany = new GoodsCompany();
                 goodsCompany.setGoodsId(goodsBean.getGoodsId());

src/main/resources/mapper/CustomMemberMapper.xml

@@ -14,7 +14,7 @@
         </if>
         <if test=' websitIds != null and websitIds.size > 0' >
             and ur.websit_id in
-            <foreach collection="websitIds" open="(" close=")" item="companyId" separator=",">
+            <foreach collection="websitIds" open="(" close=")" item="websitId" separator=",">
                 #{websitId}
             </foreach>
         </if>