机构版-2.1.0

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/StudentExporter.java

@@ -46,17 +46,17 @@ public class StudentExporter {
                     //色彩
                     if (str.contains("SC")) {
                         String[] strings = str.split(":");
-                        studentExpDTO.setSc(strings[1]);
+                        studentExpDTO.setSc("0".equals(strings[1]) ? "缺考" : "");
                     }
                     //素描
                     if (str.contains("SM")) {
                         String[] strings = str.split(":");
-                        studentExpDTO.setSm(strings[1]);
+                        studentExpDTO.setSm("0".equals(strings[1]) ? "缺考" : "");
                     }
                     //速写
                     if (str.contains("SX")) {
                         String[] strings = str.split(":");
-                        studentExpDTO.setSx(strings[1]);
+                        studentExpDTO.setSx("0".equals(strings[1]) ? "缺考" : "");
                     }
                 }
                 list.add(studentExpDTO);

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/specification/StudentSpecification.java

@@ -157,6 +157,9 @@ public class StudentSpecification extends PagingAndSortingSpecification {
                 listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:1,SC:1,SM:0"));
                 listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:1,SC:0,SM:1"));
                 listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:0,SC:1,SM:1"));
+                listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:0,SC:0,SM:1"));
+                listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:0,SC:1,SM:0"));
+                listPermission1.add(cb.equal(root.get("uploadStatus"), "SX:1,SC:0,SM:0"));
 
             } else {
                 if (getIsAbsent() != null) {