Parcourir la source

财务列表bug修复

Signed-off-by: anderx <312518615@qq.com>
anderx il y a 6 ans
Parent
commit
7a6d48ad06

+ 0 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1094,9 +1094,6 @@ left join t_order_outsource too on o.order_no=too.order_no where delete_sign !=
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-  		<if test="o.financeId != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
-	  	</if>
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
 	  	and d.finance_id in 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
@@ -1147,9 +1144,6 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-  		<if test="o.financeId != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
-	  	</if>
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
 	  	and d.finance_id in 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -157,10 +157,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> result = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
+		List<String> fids=new ArrayList<>();
 		if(TokenManager.hasRole(AFTConstants.FINANCE)) {
-			order.setFinanceId(TokenManager.getAdminId());
+			 fids.add(TokenManager.getAdminId());
+			params.put("fids",fids);
 		}
-		List<String> fids=null;
 		if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			fids =adminMapper.selectBySuperId(TokenManager.getAdminId());
 			params.put("fids", fids);