Browse Source

列表BUG修复

anderx 2 years ago
parent
commit
5372110771

+ 4 - 7
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -630,23 +630,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
 
     private void addParam(InputPageListBo in, Map<String, Object> param) {
-        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");
         }
         if (in.getStatus()!=null)param.put("status",in.getStatus());
+        if (in.getAid()==null){
+            param.put("aid",in.getAid());
+        }
         if (in.getProcessStatus()==null){
             if(PurviewUtils.superPurview()){
                 param.put("superShiro",1);
-
             }else {
                 param.put("processStatus",0);
-
+                param.put("aid",TokenManager.getAdminId());
             }
         }else {
                 param.put("processStatus",in.getProcessStatus());