Merge remote-tracking branch 'origin/test' into test

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

@@ -20,6 +20,8 @@ public class SysMenuRecordVo {
      */
     @ApiModelProperty(value = "用户姓名")
     private String userName;
+    @ApiModelProperty(value = "机构名称")
+    private String deptName;
 
     /**
      * 点击车险录单数量

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

@@ -75,7 +75,9 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
                     .eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
             if (sysDept == null) continue;
             String deptName = getDeptName(sysUser.getDeptId());
-            sysGeographyPositionInfoVo.setDeptName(sysDept.getName());
+//            sysGeographyPositionInfoVo.setDeptName(sysDept.getName());
+            sysGeographyPositionInfoVo.setDeptName(deptName);
+
 
         }
 
@@ -87,14 +89,35 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
     }
 
     private String getDeptName(String deptId) {
+        StringBuilder stringBuilder = new StringBuilder();
         SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getId, deptId).eq(SysDept::getDelFlag, 0));
-//        if (sysDept.getComlevel()==) {
-//
-//        }
+        if (StringUtils.isEmpty(sysDept.getComlevel())) {
+            SysDept sysDept5 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
+                    .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("5")) {
+            SysDept sysDept4 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("4")) {
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("3")) {
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
+
+        }else if (sysDept.getComlevel().equals("2")) {
+            stringBuilder.append(sysDept.getName());
+        }
 
 
-        return null;
+        return stringBuilder.toString();
     }
 
     @Override
@@ -106,6 +129,17 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
         wrapper.orderByDesc(SysGeographyPositionRecord::getCreateTime);
 
         Page<SysGeographyPositionRecord> insOrdersPage = sysGeographyPositionRecordService.page(page, wrapper);
+        List<SysGeographyPositionRecord> records = insOrdersPage.getRecords();
+        if (records.size()>0) {
+            for (SysGeographyPositionRecord record : records) {
+                SysUser sysUser = sysUserService.getById(record.getUserId());
+                if (sysUser == null) continue;
+                record.setLeaderName(sysUser.getLeaderName());
+                String deptName = getDeptName(sysUser.getDeptId());
+                record.setDeptName(deptName);
+
+            }
+        }
 
         return new BasePageResult<>(sysGeographyPositionPageDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -237,7 +271,9 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
             SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
                     .eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
             if (sysDept == null) continue;
-            sysGeographyPositionInfoVo.setDeptName(sysDept.getName());
+            String deptName = getDeptName(sysUser.getDeptId());
+            sysGeographyPositionInfoVo.setDeptName(deptName);
+//            sysGeographyPositionInfoVo.setDeptName(sysDept.getName());
 
         }
 

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

@@ -11,6 +11,7 @@ import com.ydtech.modules.admin.model.SysMenuRecord;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysMenuRecordDto;
 import com.ydtech.modules.admin.model.vo.SysMenuRecordVo;
+import com.ydtech.modules.admin.service.SysGeographyPositionService;
 import com.ydtech.modules.admin.service.SysMenuRecordService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -35,6 +36,9 @@ public class SysMenuRecordServiceImpl  extends ServiceImpl<SysMenuRecordMapper,
     @Resource
     private SysUserMapper sysUserMapper;
 
+    @Resource
+    private SysGeographyPositionServiceImpl sysGeographyPositionService;
+
     @Override
     public boolean insert(Integer type, Integer menuType) {
         SysMenuRecord sysMenuRecord = new SysMenuRecord();
@@ -68,7 +72,7 @@ public class SysMenuRecordServiceImpl  extends ServiceImpl<SysMenuRecordMapper,
 
     @Override
     public SysMenuRecordVo getClickMenu(SysMenuRecordDto sysMenuRecordDto) {
-        SysMenuRecordVo sysMenuRecordVo = new SysMenuRecordVo(null,null,0l,0l,0l,0l,0l,0l,null,null,null,null,null,null);
+        SysMenuRecordVo sysMenuRecordVo = new SysMenuRecordVo(null,null,null,0l,0l,0l,0l,0l,0l,null,null,null,null,null,null);
         List<SysMenuRecord> sysMenuRecords = baseMapper.selectList(new LambdaQueryWrapper<SysMenuRecord>().eq(!StringUtils.isNotEmpty(sysMenuRecordDto.getUserId()), SysMenuRecord::getUserId, sysMenuRecordDto.getUserId())
                 .eq(sysMenuRecordDto.getType() != null, SysMenuRecord::getType, sysMenuRecordDto.getType())
                 .eq( SysMenuRecord::getUserId, sysMenuRecordDto.getUserId())
@@ -78,6 +82,8 @@ public class SysMenuRecordServiceImpl  extends ServiceImpl<SysMenuRecordMapper,
         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
@@ -161,5 +167,37 @@ public class SysMenuRecordServiceImpl  extends ServiceImpl<SysMenuRecordMapper,
         return sysMenuRecordVo;
     }
 
+    private String getDeptName(String deptId) {
+        StringBuilder stringBuilder = new StringBuilder();
+        SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                .eq(SysDept::getId, deptId).eq(SysDept::getDelFlag, 0));
+        if (StringUtils.isEmpty(sysDept.getComlevel())) {
+            SysDept sysDept5 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
+                    .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("5")) {
+            SysDept sysDept4 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("4")) {
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept.getParentId());
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
+        }else if (sysDept.getComlevel().equals("3")) {
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept.getParentId());
+            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
+
+        }else if (sysDept.getComlevel().equals("2")) {
+            stringBuilder.append(sysDept.getName());
+        }
+
+
+        return stringBuilder.toString();
+    }
+
 
 }