licailing 4 éve
szülő
commit
68cf4d46d7

+ 0 - 32
src/main/java/com/izouma/wenlvju/domain/Alliance.java

@@ -1,32 +0,0 @@
-package com.izouma.wenlvju.domain;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-//@Entity
-@Where(clause = "del = 0")
-@ApiModel(value = "艺考联盟")
-public class Alliance {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @ExcelIgnore
-    private Long id;
-
-    private String name;
-
-    private boolean del;
-}

+ 0 - 2
src/main/java/com/izouma/wenlvju/repo/UserRepo.java

@@ -28,6 +28,4 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
 
     List<User> findAllByDistrictAndAuthoritiesContainsAndDelFalse(String district, Authority authorities);
 
-    User findByPhoneAndDelFalseAndIdIsNot(String phone, Long id);
-
 }

+ 1 - 1
src/main/vue/src/views/Settings.vue

@@ -135,7 +135,7 @@ export default {
                         '/setting/save',
                         {
                             ...data,
-                            active: false,
+                            del: true,
                             children: null
                         },
                         { body: 'json' }