|
|
|
@ -5,10 +5,12 @@ import com.ruoyi.common.annotation.Log;
|
|
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
|
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
|
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
|
|
import com.ruoyi.system.domain.SysPost;
|
|
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
|
|
import com.ruoyi.system.service.ISysPostService;
|
|
|
|
|
import com.ruoyi.system.service.ISysRoleService;
|
|
|
|
@ -98,7 +100,10 @@ public class SysUsernumController extends BaseController {
|
|
|
|
|
List<SysUser> list = new ArrayList<>();
|
|
|
|
|
for (SysUser User : sysUsers){
|
|
|
|
|
if (User.getDeptId().equals(deptId)){
|
|
|
|
|
List<SysRole> sysRoles = roleService.selectRolesByUserId(User.getUserId());
|
|
|
|
|
mmap.put("sysRoles", sysRoles);
|
|
|
|
|
list.add(User);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
mmap.put("list", list);
|
|
|
|
|