add feature# 用户编辑增加别名字段

@@ -24,7 +24,7 @@ class User (db.Model):
     create_time = Column(DateTime)
     create_time = Column(DateTime)
     update_time = Column(DateTime)
     update_time = Column(DateTime)
     role = Column(Text)
     role = Column(Text)
-    displayname = Column(Text, nullable=True)  # 昵称
+    displayname = Column(Text, nullable=False)  # 昵称
     # 用户来源，默认dmap平台用户
     # 用户来源，默认dmap平台用户
     origin = Column(Text, default=OriginEnum.Dmap.name.lower())
     origin = Column(Text, default=OriginEnum.Dmap.name.lower())
     status = Column(Integer, default=UserStatusEnum.Active)  # 1:激活，2:冻结，0:注销
     status = Column(Integer, default=UserStatusEnum.Active)  # 1:激活，2:冻结，0:注销

@@ -34,7 +34,7 @@ class Api(ApiTemplate):
             position = AESHelper.decode(self.para.get("position", ''))
             position = AESHelper.decode(self.para.get("position", ''))
             email = AESHelper.decode(self.para.get("email", ''))
             email = AESHelper.decode(self.para.get("email", ''))
             phone = AESHelper.decode(self.para.get("phone", ''))
             phone = AESHelper.decode(self.para.get("phone", ''))
-            displayname = username
+            displayname = AESHelper.decode(self.para.get("displayname", ''))
             # 是否重名
             # 是否重名
             if(User.query.filter_by(username=username).one_or_none()):
             if(User.query.filter_by(username=username).one_or_none()):
                 res["msg"] = "username 已存在"
                 res["msg"] = "username 已存在"

@@ -31,7 +31,7 @@ class Api(ApiTemplate):
                                "role": tmp_user.role, "company": tmp_user.company,
                                "role": tmp_user.role, "company": tmp_user.company,
                                "position": tmp_user.position, "email": tmp_user.email,
                                "position": tmp_user.position, "email": tmp_user.email,
                                "phone": tmp_user.phone, "display_name": tmp_user.displayname,
                                "phone": tmp_user.phone, "display_name": tmp_user.displayname,
-                               "status": tmp_user.status}
+                               "status": tmp_user.status, "displayname": tmp_user.displayname}
             else:
             else:
                 # 获取集合
                 # 获取集合
                 userLinq = User.query.order_by(User.id.desc())
                 userLinq = User.query.order_by(User.id.desc())
@@ -46,7 +46,7 @@ class Api(ApiTemplate):
                     "list": list(map(lambda t:
                     "list": list(map(lambda t:
                                      {"guid": t.id, "username": t.username,
                                      {"guid": t.id, "username": t.username,
                                          "role": t.role, "display_name": t.displayname,
                                          "role": t.role, "display_name": t.displayname,
-                                         "status": t.status},
+                                         "status": t.status, "displayname": t.displayname},
                                      tmp_list))}
                                      tmp_list))}
             res["result"] = True
             res["result"] = True