|
@@ -48,8 +48,6 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
|
|
|
private IPositionAddressService positionAddressService;
|
|
private IPositionAddressService positionAddressService;
|
|
|
@Value("${jeecg.c_port.path}")
|
|
@Value("${jeecg.c_port.path}")
|
|
|
private String path;
|
|
private String path;
|
|
|
- @Autowired
|
|
|
|
|
- private IPositionService positionService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Page<Position> queryPageList1(Page<Position> page, Position position) {
|
|
public Page<Position> queryPageList1(Page<Position> page, Position position) {
|
|
@@ -520,7 +518,7 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
|
|
|
String positionId1 = jsonObject1.getString("positionId");
|
|
String positionId1 = jsonObject1.getString("positionId");
|
|
|
//岗位名称
|
|
//岗位名称
|
|
|
if (StringUtils.isNotBlank(positionId)) {
|
|
if (StringUtils.isNotBlank(positionId)) {
|
|
|
- String positionName = positionService.getById(positionId1).getPositionName();
|
|
|
|
|
|
|
+ String positionName =getById(positionId1).getPositionName();
|
|
|
jsonObject1.put("positionName", positionName);
|
|
jsonObject1.put("positionName", positionName);
|
|
|
}
|
|
}
|
|
|
if("6".equals(jsonObject1.getString("positionCategory"))){
|
|
if("6".equals(jsonObject1.getString("positionCategory"))){
|