Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -199,7 +199,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
             });
 
         });
-        return new PageData<>(result,result.size());
+        return new PageData<>(result,count.get());
     }
 
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -273,6 +273,7 @@
     </select>
     <select id="getStaffList" resultType="com.epmet.dto.result.CustomerGridStaffResultDTO">
          SELECT
+            DISTINCT
             cs.USER_ID,
             cs.REAL_NAME userName,
             cs.MOBILE,
@@ -291,6 +292,7 @@
          <if test="mobile != null and mobile != ''">
             AND cs.mobile = #{mobile}
         </if>
+         AND cs.CUSTOMER_ID = #{customerId}
          AND gsr.role_key IN
         <foreach collection="roleKeyList" item="item" open="(" close=")" separator=",">
             #{item}