用户分页修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -34,6 +34,7 @@ import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmService;
+import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.web.core.config.CaneraConfig;
 import com.ozs.web.core.util.CameraUtil;
@@ -93,6 +94,8 @@ public class BaseCameraManagementController extends BaseController {
     private CaneraConfig caneraConfig;
     @Autowired
     private IdempotenceUtils idempotenceUtils;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 
     /**
      * 所有相机列表+权限
@@ -169,11 +172,8 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
-        List<String> userIds = baseCameraManagementService.getUserIdList(getUserId());
+        baseCameraManagementVo= (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(),baseCameraManagementVo);
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(userIds)) {
-            lw.in(BaseCameraManagement::getCreateBy, userIds);
-        }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getLineDir()) && baseCameraManagementVo.getLineDir() != 0) {
             lw.eq(BaseCameraManagement::getLineDir, baseCameraManagementVo.getLineDir());
         }
@@ -193,6 +193,11 @@ public class BaseCameraManagementController extends BaseController {
             int miles = AppendUtils.stringSplit(baseCameraManagementVo.getInstallMiles());
             lw.eq(BaseCameraManagement::getInstallMile, miles);
         }
+        if(!baseCameraManagementVo.getDsFlay()){
+//         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsUserId())){
+//             lw.eq()
+//         }
+        }
         IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -73,6 +73,8 @@ public class SysUserController extends BaseController {
     private ISysPostService postService;
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private ISysRoleService iSysRoleService;
 
 //    /**
 //     * 获取用户列表
@@ -116,10 +118,21 @@ public class SysUserController extends BaseController {
         IPage<SysUser> page = userService.page(new Page<>(sysUserVo.getPageNum(), sysUserVo.getPageSize()), wrapper);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<SysUser> dto1 = page.getRecords().stream().map(o -> {
+                List<Long> longs=new ArrayList<>();
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
                 if (!ObjectUtils.isEmpty(sysDept)) {
                     o.setDeptName(sysDept.getDeptName());
                 }
+                if (SysUser.isAdmin(o.getId())) {
+                    List<SysRole> roles = roleService.selectRoleAll();
+                    for (SysRole role : roles) {
+                        longs.add(role.getRoleId());
+                    }
+                }else {
+                    longs = iSysRoleService.selectRoleListByUserId(o.getId());
+                }
+                Long[] objects = longs.toArray(new Long[]{});
+                o.setRoleIds(objects);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);