|
|
@@ -630,7 +630,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
|
|
|
private void addParam(InputPageListBo in, Map<String, Object> param) {
|
|
|
- param.put("aid",TokenManager.getAdminId());
|
|
|
+ if (in.getAid()==null){
|
|
|
+ param.put("aid",TokenManager.getAdminId());
|
|
|
+ }else {
|
|
|
+ param.put("aid",in.getAid());
|
|
|
+ }
|
|
|
if (in.getStartTime()!=null&&in.getEndTime()!=null){
|
|
|
param.put("startTime",in.getStartTime());
|
|
|
param.put("endTime",in.getEndTime()+" 23:59:59");
|
|
|
@@ -639,7 +643,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getProcessStatus()==null){
|
|
|
if(PurviewUtils.superPurview()){
|
|
|
param.put("superShiro",1);
|
|
|
- param.put("aid",in.getAid());
|
|
|
+
|
|
|
}else {
|
|
|
param.put("processStatus",0);
|
|
|
|
|
|
@@ -657,7 +661,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getUsername()!=null)param.put("username",in.getUsername());
|
|
|
if (in.getApplyDep()!=null)param.put("applyDep",in.getApplyDep());
|
|
|
if (in.getPayDep()!=null)param.put("payDep",in.getPayDep());
|
|
|
- if (in.getType()!=null)param.put("type",in.getContractNo());
|
|
|
+ if (in.getType()!=null)param.put("type",in.getType());
|
|
|
}
|
|
|
|
|
|
/**
|