xiongzhu 4 gadi atpakaļ
vecāks
revīzija
62295915dd

+ 1 - 2
src/main/java/com/izouma/nineth/service/UserService.java

@@ -60,7 +60,7 @@ public class UserService {
     }
 
     public User create(UserRegister userRegister) {
-        if (StringUtils.isNoneEmpty(userRegister.getPhone()) && userRepo.findByPhoneAndDelFalse(userRegister.getPhone()) != null) {
+        if (StringUtils.isNoneEmpty(userRegister.getPhone()) && userRepo.findByPhoneAndDelFalse(userRegister.getPhone()).orElse(null) != null) {
             throw new BusinessException("该手机号已注册");
         }
         User user = new User();
@@ -86,7 +86,6 @@ public class UserService {
     public User loginByPhone(String phone, String code) {
         smsService.verify(phone, code);
         User user = userRepo.findByPhoneAndDelFalse(phone).orElse(null);
-        ;
         if (user == null) {
             String name = "9th_" + RandomStringUtils.randomAlphabetic(8);
             user = create(UserRegister.builder()

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

@@ -38,7 +38,7 @@
                         <el-input v-model="formData.password"></el-input>
                     </el-form-item>
                     <el-form-item prop="phone" label="手机">
-                        <el-input v-model="formData.phone"></el-input>
+                        <el-input v-model="formData.phone" :disabled="formData.id"></el-input>
                     </el-form-item>
                     <!-- <el-form-item prop="authorities" label="角色">
                         <el-select

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

@@ -38,7 +38,7 @@
                         <el-input v-model="formData.password"></el-input>
                     </el-form-item>
                     <el-form-item prop="phone" label="手机">
-                        <el-input v-model="formData.phone"></el-input>
+                        <el-input v-model="formData.phone" :disabled="formData.id"></el-input>
                     </el-form-item>
                     <el-form-item prop="authorities" label="角色">
                         <el-select

+ 11 - 3
src/main/vue/src/views/UserList.vue

@@ -25,9 +25,9 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="username" label="用户名" min-width="300"> </el-table-column>
-            <el-table-column prop="nickname" label="昵称" min-width="300"> </el-table-column>
-            <el-table-column label="头像" min-width="300">
+            <el-table-column prop="username" label="用户名"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称"> </el-table-column>
+            <el-table-column label="头像">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
@@ -37,6 +37,8 @@
                     ></el-image>
                 </template>
             </el-table-column>
+            <el-table-column label="手机" prop="phone"></el-table-column>
+            <el-table-column label="创建时间" prop="createdAt" width="150"></el-table-column>
             <el-table-column label="操作" align="center" fixed="right">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
@@ -85,6 +87,12 @@ export default {
                 return { search: this.search };
             }
         },
+        afterGetData(res) {
+            // let i = this.tableData.findIndex(i => i.username === 'root');
+            // if (i > -1) {
+            //     this.tableData.splice(i, 1);
+            // }
+        },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
             if (!multipleMode) {