|
|
@@ -1273,10 +1273,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
if(in.getStatus()!=null)params.put("status",in.getStatus());
|
|
|
if(in.getType()!=null)params.put("type",in.getType());
|
|
|
- if (in.getDepId()!=null)params.put("depId",in.getDepId());
|
|
|
+ if (in.getDepId()!=null){
|
|
|
+ ArrayList<Object> deps = new ArrayList<>();
|
|
|
+ deps.add(in.getDepId());
|
|
|
+ params.put("deps",deps);
|
|
|
+ }
|
|
|
if (in.getContractNo()!=null)params.put("contractNo",in.getContractNo());
|
|
|
if (in.getBuyerName()!=null)params.put("buyerName",in.getBuyerName());
|
|
|
- if (in.getAname()!=null)params.put("aname",in.getAname());
|
|
|
+ if (in.getAid()!=null)params.put("aid",in.getAid());
|
|
|
if (in.getApplyDep()!=null)params.put("applyDep",in.getApplyDep());
|
|
|
if (in.getPayDep() != null)params.put("payDep",in.getPayDep());
|
|
|
if (in.getStartTime()!=null)params.put("startTime",in.getStartTime());
|
|
|
@@ -1287,10 +1291,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
params.put("roleType",3);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
params.put("roleType",2);
|
|
|
- params.put("aid",TokenManager.getAdminId());
|
|
|
+ params.put("current",TokenManager.getAdminId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
params.put("roleType",1);
|
|
|
- params.put("aid",TokenManager.getAdminId());
|
|
|
+ params.put("current",TokenManager.getAdminId());
|
|
|
}else{
|
|
|
params.put("roleType",0);
|
|
|
}
|