Pārlūkot izejas kodu

财务经理BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 gadi atpakaļ
vecāks
revīzija
8ca49f87fa

+ 3 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1155,14 +1155,14 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.ou
 	  	<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;">
+  		<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 = 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
-        #{item.id}
-       </foreach>
+       		#{item}
+     	</foreach>
 		</if>
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
@@ -1176,7 +1176,6 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.ou
   		<if test="o.liquidationStatus != null">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
-  		
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>

+ 0 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -368,7 +368,6 @@
 				uid : /*[[${adminData.id}]]*/'',
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
-				isFinanceAdmin : /*[[${shiro.hasRole('99997')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;
@@ -382,7 +381,6 @@
 			window.showPermissionList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/permissionList')}]]*/false;
 			window.showRoleList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/roleList')}]]*/false;
 			window.showAuditStatus = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/auditStatus')}]]*/false;
-
 			window.showUserOrderList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userOrder')}]]*/false;
 			window.showSystem = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/system')}]]*/false;
 			/*]]>*/