修复业务线版本 报表分享问题
This commit is contained in:
parent
d1d2130a52
commit
3775dbe686
|
|
@ -28,4 +28,6 @@ public class SalarySobQueryParam extends BaseQueryParam {
|
||||||
* 数据过滤级别
|
* 数据过滤级别
|
||||||
*/
|
*/
|
||||||
private AuthFilterTypeEnum filterType;
|
private AuthFilterTypeEnum filterType;
|
||||||
|
|
||||||
|
private boolean isShare;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,6 @@ public class TaxAgentQueryParam extends BaseQueryParam {
|
||||||
|
|
||||||
//个税扣缴义务人名称
|
//个税扣缴义务人名称
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
private boolean isShare;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -303,6 +303,7 @@ public class SalaryStatisticsReportWrapper extends Service {
|
||||||
// 如果是被分享的报表,校验分享权限,通过后将user赋值为报表创建人
|
// 如果是被分享的报表,校验分享权限,通过后将user赋值为报表创建人
|
||||||
User creator = new User();
|
User creator = new User();
|
||||||
creator.setUid(po.getCreator().intValue());
|
creator.setUid(po.getCreator().intValue());
|
||||||
|
creator.setLogintype("1");
|
||||||
user = creator;
|
user = creator;
|
||||||
} else {
|
} else {
|
||||||
// 判断报表是否是登陆人创建的,或薪酬总管理员
|
// 判断报表是否是登陆人创建的,或薪酬总管理员
|
||||||
|
|
|
||||||
|
|
@ -238,6 +238,9 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
|
||||||
}
|
}
|
||||||
|
|
||||||
List<SalarySobPO> list = getSalarySobMapper().listSome(build);
|
List<SalarySobPO> list = getSalarySobMapper().listSome(build);
|
||||||
|
if (param.isShare() == true) {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
return getAuthService(user).auth(list, param.getFilterType(), SalarySobPO.class);
|
return getAuthService(user).auth(list, param.getFilterType(), SalarySobPO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -291,6 +291,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
|
||||||
public List<TaxAgentPO> listAuth(TaxAgentQueryParam queryParam) {
|
public List<TaxAgentPO> listAuth(TaxAgentQueryParam queryParam) {
|
||||||
List<TaxAgentPO> taxAgents = getTaxAgentMapper().listBySome(queryParam);
|
List<TaxAgentPO> taxAgents = getTaxAgentMapper().listBySome(queryParam);
|
||||||
AuthFilterTypeEnum filterType = queryParam.getFilterType();
|
AuthFilterTypeEnum filterType = queryParam.getFilterType();
|
||||||
|
if (queryParam.isShare()) {
|
||||||
|
return taxAgents;
|
||||||
|
}
|
||||||
return getAuthService(user).auth(taxAgents, filterType, TaxAgentPO.class);
|
return getAuthService(user).auth(taxAgents, filterType, TaxAgentPO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue