经营报表修改

mec-biz/src/main/resources/config/mybatis/SysPaymentConfigMapper.xml

@@ -184,6 +184,10 @@
                 AND spc.hf_mer_no_ !=''
             </if>
         </where>
+    </select>
 
+    <!-- 获取所有账户类型为外部的账户 -->
+    <select id="getOutAccounts" resultMap="SysPaymentConfig">
+        SELECT * FROM sys_payment_config WHERE account_type_ = 1
     </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -90,8 +90,10 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/add')")
     public HttpResponseResult<StudentPaymentRouteOrderDto> add(@RequestBody StudentPaymentRouteOrderDto studentPaymentRouteOrderDto) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        studentPaymentRouteOrderDto.setUserId(sysUser.getId());
+        if (studentPaymentRouteOrderDto.getUserId() == null) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            studentPaymentRouteOrderDto.setUserId(sysUser.getId());
+        }
         if (studentPaymentRouteOrderDto.getSchoolId() != null) {
             studentPaymentRouteOrderDto.setMusicGroupId(studentPaymentRouteOrderDto.getSchoolId().toString());
         }