yzc преди 2 години
родител
ревизия
326e3030d3

+ 0 - 6
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -122,8 +122,6 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
 
         // 获取到请款明细信息
-//        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDetailService.list(q -> q
-//                .eq(AccountRequestFundsDetail::getAccountRequestFundsId, accountRequestFunds.getId()));
         List<AccountRequestFundsDetailVo> accountRequestFundsDetailVos =
                 accountRequestFundsDetailService.listByAccountRequestFundsId(accountRequestFunds.getId());
 
@@ -144,10 +142,6 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
             throw new ServiceException("没有找到归属部门信息");
         }
         accountRequestFundsVo.setDeptName(sysDept.getDeptName());
-        DynamicDataSourceContextHolder.poll();
-
-        // 切换数据源
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         // 赋值流程实例id
         FlowExample flowExample = flowExampleService.getOne(q -> q.eq(FlowExample::getBusinessId, accountRequestFunds.getId()));
         if (ObjectUtil.isNotEmpty(flowExample)) {

+ 1 - 3
hx-account/src/main/resources/mapper/account/AccountRequestFundsDetailMapper.xml

@@ -34,10 +34,8 @@
             c.`code` contractCode
         FROM
             account_request_funds_detail arfd
-                LEFT JOIN bytesailing_sale.contract c ON arfd.contract_id
+                LEFT JOIN bytesailing_sale.contract c ON arfd.contract_id = c.id
         WHERE
             arfd.account_request_funds_id = #{accountRequestFundsId}
-        GROUP BY
-            arfd.id
     </select>
 </mapper>