xiaofei преди 1 година
родител
ревизия
97a0996ec0

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanLogController.java

@@ -58,7 +58,7 @@ public class ScanLogController {
     @ApiOperation(value = "日志文件查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @Aac(auth = false)
-    public Result listGroupQuestions(@ApiParam(value = "学校代码", required = true) @RequestParam String schoolCode,
+    public Result listGroupQuestions(@ApiParam(value = "学校代码") @RequestParam(required = false) String schoolCode,
                                      @ApiParam(value = "扫描账号") @RequestParam(required = false) String loginName,
                                      @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                      @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {

+ 3 - 1
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanLogServiceImpl.java

@@ -62,7 +62,9 @@ public class ScanLogServiceImpl extends MppServiceImpl<ScanLogMapper, ScanLog> i
         Page<ScanLog> page = new Page<>(pageNumber, pageSize);
         QueryWrapper<ScanLog> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ScanLog> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(ScanLog::getSchoolCode, schoolCode);
+        if (StringUtils.isNotBlank(schoolCode)) {
+            lambdaQueryWrapper.eq(ScanLog::getSchoolCode, schoolCode);
+        }
         if (StringUtils.isNotBlank(loginName)) {
             lambdaQueryWrapper.likeRight(ScanLog::getLoginName, loginName);
         }