机车车载终端信息表修改

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

@@ -118,15 +118,13 @@ public class SysUserController extends BaseController {
                 } else {
                     longs = iSysRoleService.selectRoleListByUserId(o.getId());
                 }
-                if (!ObjectUtils.isEmpty(longs)) {
-                    Long[] objects = longs.toArray(new Long[]{});
-                    QueryWrapper<SysRole> wrapper = new QueryWrapper<>();
-                    wrapper.in("role_id", Arrays.asList(objects));
-                    List<SysRole> roles = roleService.list(wrapper);
-                    List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
-                    o.setRoleNames(collect);
-                    o.setRoleIds(objects);
-                }
+                Long[] objects = longs.toArray(new Long[]{});
+                QueryWrapper<SysRole> wrapper = new QueryWrapper<>();
+                wrapper.in("role_id", Arrays.asList(objects));
+                List<SysRole> roles = roleService.list(wrapper);
+                List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
+                o.setRoleNames(collect);
+                o.setRoleIds(objects);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -137,7 +135,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response,@RequestBody SysUserVo sysUserVo) {
+    public void export(HttpServletResponse response, @RequestBody SysUserVo sysUserVo) {
         List<Long> longs = new ArrayList<>();
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         List<SysUser> usetList = userService.usetList(sysUserVo);
@@ -166,15 +164,15 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        String password=null;
+        String password = null;
         ExcelUtil<SysUsers> util = new ExcelUtil<SysUsers>(SysUsers.class);
         List<SysUsers> userList = util.importExcel(file.getInputStream());
         String userId = getUserId();
         List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
-        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
-            password=data.get(0).getDictValue();
-        }else {
-            password=defaultPassword;
+        if (!ObjectUtils.isEmpty(data.get(0).getDictValue())) {
+            password = data.get(0).getDictValue();
+        } else {
+            password = defaultPassword;
         }
         String message = userService.importUser(userList, updateSupport, userId, password);
         return success(message);