Commit 971f04a7 authored by Fuzy's avatar Fuzy

修正

parent 67ee354c
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.WagesConversionMapper; import com.ruoyi.system.mapper.WagesConversionMapper;
import com.ruoyi.system.model.wages.dao.WagesConversionData; import com.ruoyi.system.model.wages.dao.WagesConversionData;
import com.ruoyi.system.model.wages.dto.WagesParamsDto; import com.ruoyi.system.model.wages.dto.WagesParamsDto;
...@@ -8,9 +11,7 @@ import com.ruoyi.system.model.wages.vo.WagesConversionDataVO; ...@@ -8,9 +11,7 @@ import com.ruoyi.system.model.wages.vo.WagesConversionDataVO;
import com.ruoyi.system.service.WagesConversionService; import com.ruoyi.system.service.WagesConversionService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections; import java.util.*;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -23,6 +24,16 @@ public class WagesConversionServiceImpl implements WagesConversionService { ...@@ -23,6 +24,16 @@ public class WagesConversionServiceImpl implements WagesConversionService {
private WagesConversionServiceImpl(WagesConversionMapper wagesConversionMapper) { private WagesConversionServiceImpl(WagesConversionMapper wagesConversionMapper) {
this.wagesConversionMapper = wagesConversionMapper; this.wagesConversionMapper = wagesConversionMapper;
} }
private static Map<String, String> roleIdMap = new HashMap<>();
static {
roleIdMap.put("10", "010101");
roleIdMap.put("11", "011704");
roleIdMap.put("12", "011204");
roleIdMap.put("13", "011702");
roleIdMap.put("14", "011701");
roleIdMap.put("15", "011502");
roleIdMap.put("16", "010102");
}
@Override @Override
public void save(WagesConversionDataVO wagesConversionDataVO) { public void save(WagesConversionDataVO wagesConversionDataVO) {
...@@ -36,6 +47,12 @@ public class WagesConversionServiceImpl implements WagesConversionService { ...@@ -36,6 +47,12 @@ public class WagesConversionServiceImpl implements WagesConversionService {
String pageSize = wagesParamsDto.getPageSize(); String pageSize = wagesParamsDto.getPageSize();
String wageMonth = wagesParamsDto.getWageMonth(); String wageMonth = wagesParamsDto.getWageMonth();
int n = (Integer.parseInt(pageNum) - 1) * Integer.parseInt(pageSize); int n = (Integer.parseInt(pageNum) - 1) * Integer.parseInt(pageSize);
SysUser user = SecurityUtils.getLoginUser().getUser();
if (user.getRoles().size() != 0){
SysRole sysRole = user.getRoles().get(0);
String roleSort = sysRole.getRoleSort();
wagesParamsDto.setMineId(roleIdMap.getOrDefault(roleSort, "0"));
}
return wagesConversionMapper.selectWagesConversionDataList(n, Integer.parseInt(pageSize), wageMonth, wagesParamsDto.getMineId()); return wagesConversionMapper.selectWagesConversionDataList(n, Integer.parseInt(pageSize), wageMonth, wagesParamsDto.getMineId());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment