Merge remote-tracking branch 'origin/master'

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java

@@ -10,6 +10,7 @@ import com.bsd.pjcloud.admin.api.dto.SysUserFaceDto;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.entity.SysUserFaceEntity;
+import com.bsd.pjcloud.admin.api.utils.DataUtil;
 import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
 import com.bsd.pjcloud.admin.api.vo.UserVO;
 import com.bsd.pjcloud.admin.mapper.SysUserFaceMapper;

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml

@@ -45,9 +45,12 @@
         u.name as username,
         u.avatar as userAvatar,
         u.phone as userMobile,
-        u.dept_id as userDeptId
+        u.dept_id as userDeptId,
+        u.dept_id as deptId,
+        d.name as deptName
         from sys_user_face a
         left join sys_user u on u.user_id = a.user_id and u.del_flag = '0'
+        left join sys_dept d on d.dept_id = u.dept_id and d.del_flag = '0'
         <where>
             <include refid="whereA"/>
             <if test="pa.username != null">