机构版-迭代

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

@@ -160,17 +160,16 @@ public class StudentSpecification extends PagingAndSortingSpecification {
 
             } else {
                 if (getIsAbsent() != null) {
-//                predicates.add(cb.equal(root.get("isAbsent"), getIsAbsent()));
                     if (Subject.SC.name().equals(getSubject())) {
-                        predicates.add(cb.equal(root.get("scMissing"), true));
+                        predicates.add(cb.equal(root.get("scMissing"), getIsAbsent()));
                     } else if (Subject.SX.name().equals(getSubject())) {
-                        predicates.add(cb.equal(root.get("sxMissing"), true));
+                        predicates.add(cb.equal(root.get("sxMissing"), getIsAbsent()));
                     } else if (Subject.SM.name().equals(getSubject())) {
-                        predicates.add(cb.equal(root.get("smMissing"), true));
+                        predicates.add(cb.equal(root.get("smMissing"), getIsAbsent()));
                     } else {
-                        listPermission.add(cb.equal(root.get("scMissing"), true));
-                        listPermission.add(cb.equal(root.get("sxMissing"), true));
-                        listPermission.add(cb.equal(root.get("smMissing"), true));
+                        listPermission.add(cb.equal(root.get("scMissing"), getIsAbsent()));
+                        listPermission.add(cb.equal(root.get("sxMissing"), getIsAbsent()));
+                        listPermission.add(cb.equal(root.get("smMissing"), getIsAbsent()));
                     }
                 }
                 if (getUpload() != null && !getUpload()) {
@@ -221,8 +220,14 @@ public class StudentSpecification extends PagingAndSortingSpecification {
                 }
             } else {
                 if (!CollectionUtils.isEmpty(listPermission)) {
-                    Predicate Pre_Or = cb.or(listPermission.toArray(new Predicate[listPermission.size()]));
-                    return query.where(Pre_And, Pre_Or).getRestriction();
+                    if(getIsAbsent()){
+                        Predicate Pre_Or = cb.or(listPermission.toArray(new Predicate[listPermission.size()]));
+                        return query.where(Pre_And, Pre_Or).getRestriction();
+                    } else {
+                        Predicate Pre_Or = cb.and(listPermission.toArray(new Predicate[listPermission.size()]));
+                        return query.where(Pre_And, Pre_Or).getRestriction();
+                    }
+
                 }
 
             }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/utils/DbBackupUtils.java

@@ -63,17 +63,17 @@ public class DbBackupUtils {
                     fileSql.createNewFile();
                 }
 
-                String mysqldump = getMysqldump(fileSql);
+//                String mysqldump = getMysqldump(fileSql);
                 //mysqldump -hlocalhost -uroot -p123456 db > /home/back.sql
                 StringBuffer sb = new StringBuffer();
                 sb.append("cmd /c ");
-                sb.append(mysqldump);
+                sb.append("mysqldump");
                 sb.append(" -h " + dbConfig.getHost());
                 sb.append(" -u" + dbConfig.getUserName());
                 sb.append(" -p" + dbConfig.getPassword());
                 sb.append(" -P" + dbConfig.getPort());
                 sb.append(" " + dbConfig.getDbName() + " >");
-                sb.append(fileSql.getAbsolutePath());
+                sb.append(fileSql.getPath());
                 LOGGER.info("cmd命令为：{}", sb.toString());
                 Runtime runtime = Runtime.getRuntime();
                 runtime.exec(sb.toString());