licailing 4 年之前
父节点
当前提交
ae270b2c34

+ 2 - 2
src/main/h5/src/views/PageMenu.vue

@@ -5,14 +5,14 @@
       block
       @click="$router.push('/recordList')"
       :color="$colors.prim"
-      >监</van-button
+      >监管管理</van-button
     >
     <van-button
       type="primary"
       block
       @click="$router.push('/expertList')"
       :color="$colors.prim"
-      >评分</van-button
+      >等级评定</van-button
     >
   </div>
 </template>

+ 1 - 0
src/main/java/com/izouma/wenlvju/domain/User.java

@@ -69,6 +69,7 @@ public class User extends BaseEntity implements Serializable {
 
     private String district;
 
+    @Column(unique = true)
     @Searchable
     private String phone;
 

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

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

+ 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);

+ 24 - 0
src/test/java/com/izouma/wenlvju/web/UserControllerTest.java

@@ -0,0 +1,24 @@
+package com.izouma.wenlvju.web;
+
+import com.izouma.wenlvju.ApplicationTests;
+import com.izouma.wenlvju.domain.User;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.UserRepo;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class UserControllerTest extends ApplicationTests {
+
+    @Autowired
+    private UserController userController;
+    @Autowired
+    private UserRepo       userRepo;
+
+    @Test
+    public void save() {
+        User user = userRepo.findById(21L).orElseThrow(new BusinessException("www"));
+        user.setPhone("18205083565");
+        userController.save(user);
+    }
+}