备案

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -1,18 +1,21 @@
 package com.izouma.wenlvju.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.enums.RecordStatus;
+import com.izouma.wenlvju.security.Authority;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 import java.time.LocalDate;
+import java.util.HashSet;
+import java.util.Set;
 
 @Data
 @Builder
@@ -108,4 +111,13 @@ public class Record extends BaseEntity {
 //
 //    @Transient
 //    private String supervisorNickname;
+
+//    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
+//    @JoinTable(
+//            name = "record_exam_room",
+//            joinColumns = {@JoinColumn(name = "record_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+//            inverseJoinColumns = {@JoinColumn(name = "exam_room_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+//    @BatchSize(size = 20)
+//    @ExcelIgnore
+//    private Set<ExamRoom> recordExamRooms = new HashSet<>();
 }

src/main/vue/src/views/ExamRoomList.vue

@@ -87,11 +87,20 @@ export default {
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
+        ...mapState(['organization'])
     },
     methods: {
         beforeGetData() {
-            return { search: this.search };
+            let data = { query: {} };
+
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.organization != null) {
+                data.query.organizationId = this.organization.id;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/PerformanceApplyList2.vue

@@ -399,11 +399,11 @@ export default {
 
             const startInfo = {
                 showStartTime: timeList[end].showStartTime,
-                showEndTime: timeList[end].showStartTime
+                showEndTime: timeList[end].showEndTime
             };
             const endInfo = {
                 showStartTime: timeList[start].showStartTime,
-                showEndTime: timeList[start].showStartTime
+                showEndTime: timeList[start].showEndTime
             };
 
             timeList[start] = {

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -38,7 +38,7 @@ public class UserRepoTest {
     @Test
     public void createUser() {
 
-        User user = userRepo.findByUsernameAndDelFalse("root");
+        User user = userRepo.findByUsernameAndDelFalse("chengban11");
         user.setPassword(new BCryptPasswordEncoder().encode("123456"));
         userRepo.save(user);
     }