|
@@ -92,10 +92,10 @@ public class LoginAceController {
|
|
@GetMapping("queryById")
|
|
@GetMapping("queryById")
|
|
public ResponseEntity<List<LoginAceDTO>> queryById(@RequestParam Map<String, Object> params) {
|
|
public ResponseEntity<List<LoginAceDTO>> queryById(@RequestParam Map<String, Object> params) {
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
- if(params.get("timeRange[0]").toString() != null && params.get("timeRange[0]").toString().length() > 0
|
|
|
|
- && params.get("timeRange[1]").toString() != null && params.get("timeRange[1]").toString().length() > 0
|
|
|
|
- ){
|
|
|
|
-
|
|
|
|
|
|
+ if (params.containsKey("timeRange[0]") && params.get("timeRange[0]") != null
|
|
|
|
+ && params.get("timeRange[0]").toString().length() > 0
|
|
|
|
+ && params.containsKey("timeRange[1]") && params.get("timeRange[1]") != null
|
|
|
|
+ && params.get("timeRange[1]").toString().length() > 0) {
|
|
String s2 = params.get("timeRange[0]").toString();
|
|
String s2 = params.get("timeRange[0]").toString();
|
|
String s3 = params.get("timeRange[1]").toString();
|
|
String s3 = params.get("timeRange[1]").toString();
|
|
params.put("stime",s2);
|
|
params.put("stime",s2);
|