Merge branch 'saff_update_feature' into dev

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -65,10 +65,13 @@
         <if test="phone!=null">
             and a.phone=#{phone}
         </if>
-        <if test="companyId!=null">
+        <!--<if test="companyId!=null">
             and a.companyIdArray=#{companyId}
+        </if>-->
+        <if test="companyId!=null">
+            and find_in_set(#{companyId}, a.companyIdArray)
         </if>
-    </select>
+ </select>
 
     <resultMap id="detail" type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
         <result property="id" column="id"/>