增加四级机构名称

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBaseVO.java

@@ -64,7 +64,6 @@ public class SysUserBaseVO {
     @ApiModelProperty(value = "报价单颜色")
     private String themeColour;
 
-
     @ApiModelProperty(value = "提交时间")
     private Date submitTime;
 
@@ -73,4 +72,11 @@ public class SysUserBaseVO {
 
     @ApiModelProperty(value = "审核人")
     private String approveBy;
+
+    @ApiModelProperty(value = "四级机构编号")
+    private String levelFourDeptId;
+
+    @ApiModelProperty(value = "四级机构名称")
+    private String levelFourDeptName;
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -447,10 +447,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public PageVo gainUserPage(PageDto pageDto) {
+    public PageVo<SysUserBaseVO> gainUserPage(PageDto<SysUserDto> pageDto) {
 
-        PageVo<SysUserBaseVO> pageVo = new PageVo();
-        Page page = new Page(pageDto.getPageNum(), pageDto.getPageSize());
+        PageVo<SysUserBaseVO> pageVo = new PageVo<>();
+        Page<SysUserBaseVO> page = new Page<>(pageDto.getPageNum(), pageDto.getPageSize());
         pageVo.setPageNum(pageDto.getPageNum());
         pageVo.setPageSize(pageDto.getPageSize());
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -88,8 +88,11 @@
         psd.name as pDeptName,
         t4.id as roleId,
         t4.name as roleName,
-        (select approve_by from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
-        (select approve_time from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveTime
+        (select approve_by from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
+        (select approve_time from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as
+        approveTime,
+        (select id from sys_dept where id = su.pDeptId ) as levelFourDeptId,
+        (select name from sys_dept where id = su.pDeptId) as levelFourDeptName
         from sys_user su
         left join sys_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id