kangwei: 修改发送信息推送接口，以及根据角色获取用户集合接口

@@ -87,5 +87,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param roleId
      * @param roleId
      * @return
      * @return
      */
      */
-    List<SysUser> queryUserByRoleId(@Param("roleId") String roleId);
+    List<SysUser> queryUserByRoleId(@Param("roleId") String roleId,@Param("departId") String departId);
 }
 }

@@ -46,9 +46,6 @@
 		u.del_flag = '0'
 		u.del_flag = '0'
 		AND u.is_system_user = '0'
 		AND u.is_system_user = '0'
 		AND u.id IN ( SELECT user_id FROM sys_user_role WHERE role_id = #{roleId} )
 		AND u.id IN ( SELECT user_id FROM sys_user_role WHERE role_id = #{roleId} )
-		<if test="username!=null and username!=''">
-			AND (u.username LIKE CONCAT('%',#{username},'%') or u.realname LIKE CONCAT('%',#{username},'%'))
-		</if>
 		<if test="departId!=null and departId!=''">
 		<if test="departId!=null and departId!=''">
 			AND d.dep_id IN
 			AND d.dep_id IN
 			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
 			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">

@@ -6,6 +6,7 @@ import com.skua.core.util.push.MessageEntity;
 import com.skua.core.util.push.PushMessageFactory;
 import com.skua.core.util.push.PushMessageFactory;
 import com.skua.modules.system.entity.SysUser;
 import com.skua.modules.system.entity.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
@@ -17,6 +18,7 @@ import java.util.stream.Collectors;
  */
  */
 @Service
 @Service
 public class SmsService {
 public class SmsService {
+    @Autowired
     private ISysUserService userService;
     private ISysUserService userService;
 
 
     public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody  ,String roleId,String forwardTag){
     public void pushMsgNoProcessByRoleId(String messageTitle ,String messageBody  ,String roleId,String forwardTag){

@@ -184,7 +184,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
     @Override
     @Override
     public List<SysUser> queryUserByRoleId(String roleId) {
     public List<SysUser> queryUserByRoleId(String roleId) {
-        return this.baseMapper.queryUserByRoleId(roleId);
+		//String ids = commonSqlMapper.getChildDepartByUserId(BaseContextHandler.getUserId());
+		//String departIds = commonSqlMapper.getChildDeparts(ids);
+		String departIds = null;
+        return this.baseMapper.queryUserByRoleId(roleId,departIds);
     }
     }
 
 
     //获取登录人所属集团
     //获取登录人所属集团