|
|
@@ -816,10 +816,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
|
|
|
if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
- if (specially==null){params.put("specially", 0);}
|
|
|
- else {
|
|
|
- params.put("specially", specially);
|
|
|
- }
|
|
|
+ if (specially==null)specially=0;
|
|
|
+ params.put("specially", specially);
|
|
|
Integer i=null;
|
|
|
if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
|
|
|
params.put("aid", TokenManager.getAdminId());
|
|
|
@@ -833,7 +831,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
|
|
|
TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
|
|
|
i=3;
|
|
|
-
|
|
|
}
|
|
|
if (specially==1){
|
|
|
params.put("aid", aid);
|