需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -114,9 +114,9 @@ public class OrderBaseController {
 
     @PostMapping("/update")
     @ApiOperation(value = "修改工单")
-    public ResponseHelper<String> update(@Valid @RequestBody PgOrderBase pgOrderBase){
-        String orderBaseId = orderBaseLogic.update(pgOrderBase);
-        return ResponseHelper.success(orderBaseId);
+    public ResponseHelper update(@Valid @RequestBody PgOrderBase pgOrderBase){
+         orderBaseLogic.update(pgOrderBase);
+        return ResponseHelper.success();
     }
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -95,9 +95,13 @@ public class AdminWebsitLogic {
             BeanUtils.copyProperties(adminWebsit, adminWebsitTree);
             trees.add(adminWebsitTree);
         }
-        AdminUserWebsitRela one = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+        AdminUserWebsitRela one = adminUserWebsitRelaService.lambdaQuery()
+                .eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+
         List<AdminWebsitTree> parentList = trees.stream()
-                .filter(x -> (one == null && x.getParentId().equals("0")) || (one != null && x.getWebsitId().equals(one.getAdminWebsitId()))).collect(Collectors.toList());
+                .filter(x -> (one == null && x.getParentId().equals("0")) ||
+                        (one != null && x.getWebsitId().equals(one.getAdminWebsitId())))
+                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(parentList)) {
             parentList = trees.stream().filter(x -> x.getParentId().equals("0")).collect(Collectors.toList());
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1661,7 +1661,7 @@ public class OrderBaseLogic {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public String update(PgOrderBase pgOrderBase) {
+    public void update(PgOrderBase pgOrderBase) {
         pgOrderBase.updateById();
     }
 }