Browse Source

列表BUG修复

anderx 2 years ago
parent
commit
6a773b8ec6

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

@@ -635,24 +635,24 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             param.put("endTime",in.getEndTime()+" 23:59:59");
         }
         if (in.getStatus()!=null)param.put("status",in.getStatus());
-
-        if(PurviewUtils.superPurview()){
-            param.put("superShiro",1);
+        //如果前端未传 0自己 1审核的参数,默认自己,在审核列表的时候判断Aid,在
+        if (in.getProcessStatus()==null) in.setProcessStatus(0);
+        if (in.getProcessStatus()==1){
+            param.put("processStatus",in.getProcessStatus());
             if (in.getAid()!=null){
                 param.put("aid",in.getAid());
             }
         }else {
-            if (in.getProcessStatus()==null){
-                param.put("processStatus",0);
-                param.put("aid",TokenManager.getAdminId());
-            }else {
-                param.put("processStatus",in.getProcessStatus());
+            if(PurviewUtils.superPurview()){
+                param.put("superShiro",1);
                 if (in.getAid()!=null){
                     param.put("aid",in.getAid());
                 }
+            }else {
+                param.put("aid",TokenManager.getAdminId());
             }
-
         }
+
         if (in.getExamineStatus()!=null){
             param.put("examineStatus",in.getExamineStatus());
         }else {