Browse Source

用户表新增昵称字段,删除身份证的唯一索引

houweiyu 5 years ago
parent
commit
39365cae1a

+ 1 - 1
fdkanfang-dao/src/main/java/com/fdkanfang/dao/backend/provider/UserProvider.java

@@ -16,7 +16,7 @@ public class UserProvider {
      */
     public String findAllBySearchKey(String searchKey){
         StringBuffer sql = new StringBuffer("" +
-                "SELECT z.id, z.user_name as userName, z.real_name as realName,  z.phone, z.sex, z.status, z.email, z.identity, z.create_time, z.update_time," +
+                "SELECT z.id, z.user_name as userName, z.real_name as realName,  z.phone, z.sex, z.status, z.email, z.identity,z.nickname, z.create_time, z.update_time," +
                 " c.role_key, c.role_name " +
                 "FROM tb_user z LEFT JOIN (select * FROM tb_user_role GROUP BY user_id) a ON a.user_id = z.id LEFT JOIN `tb_role` c ON c.id = a.role_id  where z.rec_status = 'A' ");
         if(StrUtil.isNotBlank(searchKey)){

+ 4 - 1
fdkanfang-domain/src/main/java/com/fdkanfang/domain/backend/UserEntity.java

@@ -46,6 +46,9 @@ public class UserEntity extends BaseModel implements Serializable {
 //    private String department; //部门
 
 
-    @Column(unique = true)
+//    @Column(unique = true)
     private String identity; //身份证号
+
+
+    private String nickname; //昵称
 }

+ 3 - 0
fdkanfang-domain/src/main/java/com/fdkanfang/domain/dto/UserDto.java

@@ -32,4 +32,7 @@ public class UserDto {
 
     private String identity;
 
+
+    private String nickname; //昵称
+
 }

+ 2 - 0
fdkanfang-domain/src/main/java/com/fdkanfang/domain/response/UserResponse.java

@@ -35,4 +35,6 @@ public class UserResponse extends BaseModel implements Serializable {
     // 角色名称
     private String roleName;
 
+    private String nickname; //昵称
+
 }