licailing 4 лет назад
Родитель
Сommit
60f6b0206c

+ 2 - 0
src/main/java/com/izouma/wenlvju/web/UserController.java

@@ -25,6 +25,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Transactional;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -67,6 +68,7 @@ public class UserController extends BaseController {
 
     @PreAuthorize("hasAnyRole('ADMIN,ORGANIZER')")
     @PostMapping("/save")
+//    @Transactional
     public User save(@RequestBody User user) {
         if (user.getId() != null) {
             User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));

+ 5 - 3
src/main/vue/src/views/performance/PerformanceList.vue

@@ -65,9 +65,11 @@
                     <el-dropdown @command="handleCommand">
                         <el-button size="mini" plain style="margin-left:10px">更多</el-button>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item :command="`/performanceEdit?id=${row.id}`">编辑</el-dropdown-item>
-                            <el-dropdown-item>发布</el-dropdown-item>
-                            <el-dropdown-item>撤销</el-dropdown-item>
+                            <el-dropdown-item :command="`/performanceEdit?id=${row.id}`" :disabled="row.publish"
+                                >编辑</el-dropdown-item
+                            >
+                            <el-dropdown-item :disabled="row.publish">发布</el-dropdown-item>
+                            <el-dropdown-item :disabled="!row.publish">撤销</el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
                 </template>

+ 1 - 1
src/main/vue/src/views/user/UserEdit.vue

@@ -155,7 +155,7 @@ export default {
                     //         id: res.id
                     //     }
                     // });
-                    // this.$router.go(-1);
+                    this.$router.go(-1);
                 })
                 .catch(e => {
                     console.log(e);