Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -335,10 +335,9 @@ public class AdminUserLogic {
         if (!adminUser.getType().equals(0)) {
             // 非平台账号，筛选能看的账号
             this.queryCanSeeAdminUser(adminUserIdList, adminUser);
+            adminUserIdList.add(adminUser.getAdminUserId());
         }
 
-        adminUserIdList.add(adminUser.getAdminUserId());
-
         IPage<AdminUser> page = adminUserService.lambdaQuery()
                 .in(CollectionUtil.isNotEmpty(adminUserIdList), AdminUser::getAdminUserId, adminUserIdList)
                 .ne(!adminUser.getUserName().equals("admin"), AdminUser::getUserName, "admin")

src/main/resources/mapper/CommonMapper.xml

@@ -20,6 +20,14 @@
         FROM
             admin_company a
         ${ex.query}
+
+        <if test="ex.companyIds != null and ex.companyIds.size > 0">
+            and admin_company_id in
+            <foreach item="item" index="index" collection="ex.companyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="supplementRecordList" resultType="com.gree.mall.manager.bean.ums.UmsSupplementRecordVO">