update

mec-biz/src/main/java/com/ym/mec/biz/dal/page/AccountLogQueryInfo.java

@@ -25,6 +25,16 @@ public class AccountLogQueryInfo extends QueryInfo {
 
     private String createEndTime;
 
+    private Boolean returnFeeFlag;
+
+    public Boolean getReturnFeeFlag() {
+        return returnFeeFlag;
+    }
+
+    public void setReturnFeeFlag(Boolean returnFeeFlag) {
+        this.returnFeeFlag = returnFeeFlag;
+    }
+
     public String getReturnFeeType() {
         return returnFeeType;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -801,9 +801,11 @@ public class ExportServiceImpl implements ExportService {
                 order.setCloudTeacherFee(cloudTeacherFee);
             }
         });
-        String[] organIdArr = params.get("oldOrganId").toString().split(",");
-        List<String> organIds = Arrays.asList(organIdArr);
-        studentPaymentOrderExportDtos.removeIf(order -> !organIds.contains(order.getOrganId().toString()));
+        if(params.get("oldOrganId") != null){
+            String[] organIdArr = params.get("oldOrganId").toString().split(",");
+            List<String> organIds = Arrays.asList(organIdArr);
+            studentPaymentOrderExportDtos.removeIf(order -> !organIds.contains(order.getOrganId().toString()));
+        }
 
         String basePath = new ApplicationHome(this.getClass()).getSource().getParentFile().getPath();
         File file = new File(basePath + "/" + managerDownload.getName());

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

@@ -81,16 +81,22 @@
     <sql id="queryPageSql">
         <where>
             <if test="createStartTime != null">
-                AND DATE_FORMAT(cal.create_time_,'%Y%m%d') >= #{createStartTime}
+                AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') >= #{createStartTime}
             </if>
             <if test="createEndTime != null">
-                AND DATE_FORMAT(cal.create_time_,'%Y%m%d') &lt;= #{createEndTime}
+                AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') &lt;= #{createEndTime}
             </if>
             <if test="payStartTime != null">
-                AND DATE_FORMAT(cal.pay_time_,'%Y%m%d') >= #{payStartTime}
+                AND DATE_FORMAT(cal.pay_time_,'%Y-%m-%d') >= #{payStartTime}
             </if>
             <if test="payEndTime != null">
-                AND DATE_FORMAT(cal.pay_time_,'%Y%m%d') &lt;= #{payEndTime}
+                AND DATE_FORMAT(cal.pay_time_,'%Y-%m-%d') &lt;= #{payEndTime}
+            </if>
+            <if test="returnFeeFlag != null and returnFeeFlag == 'true'">
+                AND cal.pay_time_ IS NOT NULL
+            </if>
+            <if test="returnFeeFlag != null and returnFeeFlag == 'false'">
+                AND cal.pay_time_ IS NULL
             </if>
             <if test="groupType != null and groupType != ''">
                 AND cal.group_type_ = #{groupType}

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

@@ -2434,7 +2434,14 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/routeOrderList')")
     public HttpResponseResult routeOrderList(StudentPaymentOrderQueryInfo queryInfo) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
         Employee employee = employeeDao.get(sysUser.getId());
+//        if (StringUtils.isEmpty(queryInfo.getRoutingOrganId())) {
+//            queryInfo.setRoutingOrganId(employee.getOrganIdList());
+//            queryInfo.setOldOrganId(employee.getOrganIdList());
+//        }
         if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
             queryInfo.setRoutingOrganId(employee.getOrganIdList());
             queryInfo.setOldOrganId(employee.getOrganIdList());

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

@@ -43,17 +43,17 @@ public class StudentApplyRefundsController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-			Employee employee = employeeDao.get(sysUser.getId());
-			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-				queryInfo.setOrganId(employee.getOrganIdList());
-			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
-				return failed("用户所在分部异常");
-			}else {
-				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
-					return failed("非法请求");
-				}
+		Employee employee = employeeDao.get(sysUser.getId());
+		if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+			queryInfo.setOrganId(employee.getOrganIdList());
+		}else if(StringUtils.isEmpty(employee.getOrganIdList())){
+			return failed("用户所在分部异常");
+		}else {
+			List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+			if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+				return failed("非法请求");
 			}
+		}
         return succeed(studentApplyRefundsService.queryPage(queryInfo));
     }
 }