Merge branch 'bugfix-xgh-12月' into 'master'

Bugfix xgh 12月

See merge request !625

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -272,7 +272,8 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         if (CollectionUtils.isEmpty(list)) {
             log.info("企微无关联gic商户,wxEnterpriseId={}",wxEnterpriseId);
-            return ServiceResponse.failure("1000", "无关联商户");
+            //return ServiceResponse.failure("1000", "无关联商户");
+            return ServiceResponse.success() ;
         }
         int count = list.size();
         log.info("企微关联数={}，{}", count, JSON.toJSONString(list));

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -329,7 +329,7 @@
         </if>
         <if test="type==2">
         	 and b.wx_open_user_id in
-	        <foreach collection="wxOpenUserIds" item="id" index="index" open="(" close=")" separator=",">
+	        <foreach collection="wxUserIds" item="id" index="index" open="(" close=")" separator=",">
 	            #{id,jdbcType=VARCHAR}
 	        </foreach>
         </if>