Browse Source

列表BUG修复

anderx 2 years ago
parent
commit
7193ac0152

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -376,7 +376,7 @@
       </if>
     <if test=" aid !=null">
     and a.aid= #{aid}
-  </if>
+    </if>
     <if test="processStatus ==1">
       and a.process_status>0
     <if test="examineStatus ==0">

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

@@ -635,18 +635,23 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             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());
+
+        if(PurviewUtils.superPurview()){
+            param.put("superShiro",1);
+            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 (in.getAid()!=null){
+                    param.put("aid",in.getAid());
+                }
+            }
+
         }
         if (in.getExamineStatus()!=null){
             param.put("examineStatus",in.getExamineStatus());