Explorar el Código

报销列表BUG和费用明细BUG修复

anderx hace 1 año
padre
commit
715612f37c

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

@@ -497,6 +497,15 @@
   </select>
   <sql id="selectExpenseAccountSql">
     where 1=1
+    <if test="processStatus ==0">
+    and a.aid =#{auditor}
+      <if test="examineStatus ==1">
+        and a.status=1
+      </if>
+      <if test="examineStatus ==2">
+        and a.status in (2,3)
+      </if>
+    </if>
     <if test="processStatus ==1">
       and a.process_status>0
       <if test="examineStatus ==1">
@@ -976,6 +985,7 @@
     ${page_sql}
   </select>
   <sql id="ExpenseDetailsSql">
+    and a.status in (0,1,2,3)
     <if test=" status != null">
       and mea.status = #{status}
     </if>

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

@@ -1644,7 +1644,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         if (in.getStatus()!=null)param.put("status",in.getStatus());
         //如果前端未传 0自己 1审核的参数,默认自己,在审核列表的时候判断Aid,在
-        if (TokenManager.hasRole(AFTConstants.SALESMAN)) in.setProcessStatus(0);
+        param.put("auditor",TokenManager.getAdminId());
         if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
              //财务经理查看权限
              in.setProcessStatus(5);
@@ -1660,12 +1660,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
              param.put("auditor",TokenManager.getAdminId());
              //如果是空设置为
              if (in.getProcessStatus()==null)in.setProcessStatus(2);
-         }
+         }else {
+            //如果不是特定角色就只看自己的
+            in.setProcessStatus(0);
+        }
          if(in.getProcessStatus()==2||in.getProcessStatus()==1){
                 if (in.getAid()!=null){
                     param.put("aid",in.getAid());
                 }
-             param.put("auditor",TokenManager.getAdminId());
         }
 
         param.put("processStatus",in.getProcessStatus());

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.3.10
+static.host=//static.jishutao.com/1.3.11
 rd.static.host=//static.jishutao.com/RD/1.0.03
 avatar.upload.host=//static.jishutao.com/upload