修改：人员列表新增字段部门名称

packages/dbgpt-system/src/dbgpt_system/sys_user/user.py

@@ -18,15 +18,15 @@ class User(BaseModel):
     nick_name: Optional[str] = None
     sex: Optional[str] = None
     phone: Optional[str] = None
-    dept_id: Optional[int] = 0
-    status: Optional[str] = '0'
+    dept_id: Optional[int] = None
+    status: Optional[str] = None
     avatar: Optional[str] = None
     email: Optional[str] = None
     remark: Optional[str] = None
     create_time: Optional[datetime] = None
     creator: Optional[str] = None
     post_ids: Optional[str] = ''
-
+    dept_name: Optional[str] = None
 
     def to_dict(self):
         return {k: self._serialize(v) for k, v in self.__dict__.items()}
@@ -55,7 +55,8 @@ class User(BaseModel):
             remark = d.get("remark",None),
             create_time=d.get("create_time", None),
             creator=d.get("creator", None),
-            post_ids=d.get("post_ids",None)
+            post_ids=d.get("post_ids",None),
+            dept_name=d.get("dept_name",None)
         )
 
 

packages/dbgpt-system/src/dbgpt_system/sys_user/user_db.py

@@ -1,6 +1,7 @@
 
 from dbgpt.storage.metadata import BaseDao
 from dbgpt_system.sys_user.user import UserEntity,UserQuery,UserResponse,User,UserSave,UserUpdate
+from dbgpt_system.dept.dept import DeptEntity
 from datetime import datetime
 userEntity =UserEntity
 
@@ -21,7 +22,9 @@ class UserDao(BaseDao):
     def select_user_page(self,user_query: UserQuery):
         session = self.get_raw_session()
         try:
-            user_qry = session.query(UserEntity).filter(UserEntity.deleted == '0')
+            user_qry = (session.query(UserEntity,DeptEntity).join(DeptEntity,UserEntity.dept_id == DeptEntity.id)
+                        .filter(UserEntity.deleted == '0')
+                        .filter(DeptEntity.deleted == '0'))
             if(user_query.username):
                 user_qry = user_qry.filter(
                     UserEntity.username.like(f"%{user_query.username}%")
@@ -55,7 +58,8 @@ class UserDao(BaseDao):
             users = []
             user_resp = UserResponse()
 
-            for user in results:
+            for user,dept in results:
+                print("dept.name:"+dept.name)
                 users.append(
                     User.from_dict(
                         {
@@ -69,6 +73,7 @@ class UserDao(BaseDao):
                             "remark": user.remark,
                             "create_time": user.create_time,
                             "post_ids": user.post_ids,
+                            "dept_name": dept.name
                         }
                     )
                 )