Merge remote-tracking branch 'origin/release-sy-v1.0.0'

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java

@@ -16,7 +16,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: CheckingController
@@ -40,8 +42,10 @@ public class DfCheckingController {
     @PostMapping("/list")
     @ApiOperation("堤防巡视检查列表")
     public IPage<DfChecking> list(@RequestBody SearchParam<DfChecking> sp) {
-        sp.getParams().put(SearchParam.ORDER_BY,"update_time");
+        Map<String, Object> params = sp.getParams() == null ? new HashMap<>(2) : sp.getParams();
-        sp.getParams().put(SearchParam.SORT_BY,"");
+        params.put(SearchParam.ORDER_BY, "update_time");
+        params.put(SearchParam.SORT_BY, "");
+        sp.setParams(params);
         return dfCheckingService.selectPage(sp);
     }
 

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java

@@ -16,7 +16,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: CheckingController
@@ -40,8 +42,10 @@ public class SzCheckingController {
     @PostMapping("/list")
     @ApiOperation("水闸巡视检查列表")
     public IPage<SzChecking> list(@RequestBody SearchParam<SzChecking> sp) {
-        sp.getParams().put(SearchParam.ORDER_BY,"update_time");
+        Map<String, Object> params = sp.getParams() == null ? new HashMap<>(2) : sp.getParams();
-        sp.getParams().put(SearchParam.SORT_BY,"");
+        params.put(SearchParam.ORDER_BY, "update_time");
+        params.put(SearchParam.SORT_BY, "");
+        sp.setParams(params);;
         return szCheckingService.selectPage(sp);
     }