Browse Source

部门名称拼接

helixiao 1 year ago
parent
commit
cb6c1dde66

+ 1 - 1
src/main/java/com/ydtech/modules/admin/service/impl/SysMenuRecordServiceImpl.java

@@ -79,12 +79,12 @@ public class SysMenuRecordServiceImpl  extends ServiceImpl<SysMenuRecordMapper,
                 .between(StringUtils.isNotEmpty(sysMenuRecordDto.getBeginTime()) && StringUtils.isNotEmpty(sysMenuRecordDto.getEndTime()),
                         SysMenuRecord::getCreateTime, sysMenuRecordDto.getBeginTime(), sysMenuRecordDto.getEndTime()));
 
+        if (sysMenuRecords.size()==0) return sysMenuRecordVo;
         SysUser sysUser = sysUserMapper.selectById(sysMenuRecordDto.getUserId());
         sysMenuRecordVo.setUserId(sysUser.getId());
         sysMenuRecordVo.setUserName(sysUser.getName());
         String deptName = getDeptName(sysUser.getDeptId());
         sysMenuRecordVo.setDeptName(deptName);
-        if (sysMenuRecords.size()==0) return sysMenuRecordVo;
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //客户端:1:APP;2:PC
         if (sysMenuRecordDto.getType()==1) {