Browse Source

审核列表修改

anderx 2 years ago
parent
commit
4289dfd716

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

@@ -371,6 +371,10 @@
       where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
     </if>
     where 1=1
+      <if test="superShiro ==1">
+        and a.process_status>0
+      </if>
+
     <if test="processStatus ==0">
     and a.aid= #{aid}
     </if>
@@ -420,6 +424,9 @@
       where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
     </if>
     where 1=1
+    <if test="superShiro ==1">
+      and a.process_status>0
+    </if>
     <if test="processStatus ==0">
       and a.aid= #{aid}
     </if>
@@ -465,6 +472,9 @@
       where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
     </if>
     where 1=1
+    <if test="superShiro ==1">
+      and a.process_status>0
+    </if>
     <if test="processStatus ==0">
       and a.aid= #{aid}
     </if>

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

@@ -588,8 +588,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         if (in.getStatus()!=null)param.put("status",in.getStatus());
         if (in.getProcessStatus()==null){
-            if(!PurviewUtils.superPurview()){
+            if(PurviewUtils.superPurview()){
+                param.put("superShiro",1);
+            }else {
                 param.put("processStatus",0);
+
             }
         }else {
                 param.put("processStatus",in.getProcessStatus());