1

src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -50,6 +50,9 @@ public class OverallController {
     ISceneColdStorageService sceneColdStorageService;
     @PostMapping("/list")
     public ResultData list(@RequestBody OverallParam param){
+        if(StringUtils.isNotBlank(param.getUserName())){
+            param.setUserId(param.getUserName());
+        }
         OverallVo vo = overallService.list(param);
         if(vo.getCode() != 0 ){
             return ResultData.error(vo.getCode(),vo.getMsg());
@@ -75,7 +78,6 @@ public class OverallController {
     @PostMapping("/cameraSceneList")
     public ResultData cameraSceneList(@RequestBody OverallParam param){
         param.setType(2);
-        param.setUserId(null);
         if(StringUtils.isNotBlank(param.getUserName())){
             List<User> userList = userService.getLikeByUserName(param.getUserName());
             List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());

src/main/java/com/fdkankan/manage/httpClient/vo/OverallParam.java

@@ -60,12 +60,7 @@ public class OverallParam {
         }
         return searchKey;
     }
-    public String getUserId() {
-        if(StringUtils.isNotBlank(userName)){
-            return userName;
-        }
-        return userId;
-    }
+
 
     public String getOrderBy() {
         if(StringUtil.isNotBlank(field)){