demo修改bug

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDate;
@@ -17,6 +18,7 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @Builder
 @Entity
+@Where(clause = "del = 0")
 @ApiModel(value = "监管管理")
 public class Regulatory extends BaseEntity {
     private Long recordId;

src/main/java/com/izouma/wenlvju/repo/RegulatoryRepo.java

@@ -15,5 +15,5 @@ public interface RegulatoryRepo extends JpaRepository<Regulatory, Long>, JpaSpec
     @Transactional
     void softDelete(Long id);
 
-    List<Regulatory> findAllByRecordId(Long recordId);
+    List<Regulatory> findAllByRecordIdOrderByCreatedAtDesc(Long recordId);
 }

src/main/java/com/izouma/wenlvju/web/RegulatoryController.java

@@ -72,7 +72,7 @@ public class RegulatoryController extends BaseController {
     @GetMapping("/byRecord")
     @ApiOperation("按检查记录查询")
     public List<Regulatory> byRecord(@RequestParam Long recordId) {
-        return regulatoryRepo.findAllByRecordId(recordId);
+        return regulatoryRepo.findAllByRecordIdOrderByCreatedAtDesc(recordId);
     }
 }
 

src/main/vue/src/views/Admin.vue

@@ -1,7 +1,8 @@
 <template>
     <el-container id="app">
         <el-aside :width="collapse ? '65px' : '200px'" class="aside">
-            <div class="logo-wrapper">Thoma&nbsp;<b>Admin</b></div>
+            <!-- <div class="logo-wrapper">Thoma&nbsp;<b>Admin</b></div> -->
+            <div class="logo-wrapper"><img class="img-width" src="../assets/logo.jpg" /></div>
             <el-menu
                 :collapse="collapse"
                 background-color="#324157"
@@ -354,14 +355,21 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        height: 60px;
+        height: 59px;
         color: white;
         font-size: 20px;
-        background: fade(black, 20%);
+        background: fade(white, 100%);
     }
 }
 
 .aside::-webkit-scrollbar {
     display: none;
 }
+
+.img-width {
+    width: auto;
+    height: auto;
+    max-width: 100%;
+    max-height: 100%;
+}
 </style>

src/main/vue/src/views/RateExpertList.vue

@@ -95,7 +95,9 @@ export default {
             statusOptions: [
                 { label: '初审中', value: 'FIRST_REVIEW_PENDING' },
                 { label: '初审通过', value: 'FIRST_REVIEW_PASS' },
-                { label: '专家通过', value: 'EXPERT_PASS' }
+                { label: '初审拒绝', value: 'FIRST_REVIEW_DENY' },
+                { label: '专家通过', value: 'EXPERT_PASS' },
+                { label: '专家拒绝', value: 'EXPERT_DENY' }
             ]
         };
     },
@@ -115,9 +117,11 @@ export default {
         },
         beforeGetData() {
             return {
+                sort: 'createdAt,desc',
                 search: this.search,
                 query: {
-                    expertUserId: this.userInfo.id
+                    expertUserId: this.userInfo.id,
+                    status: ['FIRST_REVIEW_PASS', 'EXPERT_PASS', 'EXPERT_DENY']
                 }
             };
         },
@@ -137,9 +141,10 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/rateEdit',
+                path: '/organization',
                 query: {
-                    id: row.id
+                    organId: row.organizationId,
+                    rateId: row.id
                 }
             });
         },