线下版本-bug-20201103

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/QualityAnalyseController.java

@@ -71,7 +71,7 @@ public class QualityAnalyseController {
             StringBuffer sql = new StringBuffer();
             sql.append("  SELECT                                                        ");
             sql.append("      mu.id markerId,                                           ");
-            sql.append("      mu.name markerName,                                       ");
+            sql.append("      mu.login_name markerName,                                       ");
             sql.append("      SUM(IF(mt.result = '" + l.getCode() + "', 1, 0)) levelCount,  ");
             sql.append("      COUNT(1) total                                            ");
             sql.append("  FROM                                                          ");

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/PaperApi.java

@@ -427,7 +427,7 @@ public class PaperApi {
                 } else if (Objects.equals(type, "task")) {
                     List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSecretNumber(workId, number);
                     if (markTasks == null || markTasks.size() == 0) {
-                        predicates.add(builder.equal(root.get("id"), null));
+                        predicates.add(builder.isNull(root.get("id")));
                     } else {
                         predicates.add(builder.equal(root.get("id"), markTasks.get(0).getPaper().getId()));
                     }