Explorar el Código

修改添加回访记录

周箭河 hace 4 años
padre
commit
5769ba3f90

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -204,7 +204,7 @@
 
     <sql id="queryPaymentOrder">
         <where>
-            <if test="search != null">
+            <if test="userIds != null">
                 AND spo.user_id_ IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -110,7 +110,7 @@
 
     <sql id="queryPaymentOrder">
         <where>
-            <if test="search != null">
+            <if test="userIds != null">
                 AND spo.user_id_ IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}

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

@@ -810,12 +810,13 @@ public class ExportController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
-        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if(userIds.size() >0){
-                queryInfo.setUserIds(userIds);
+            if (userIds.size() <= 0) {
+                userIds.add(0);
             }
+            queryInfo.setUserIds(userIds);
         }
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
@@ -1876,12 +1877,13 @@ public class ExportController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
-        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if(userIds.size() >0){
-                queryInfo.setUserIds(userIds);
+            if (userIds.size() <= 0) {
+                userIds.add(0);
             }
+            queryInfo.setUserIds(userIds);
         }
         queryInfo.setPage(1);
         queryInfo.setRows(49999);

+ 4 - 3
mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -71,12 +71,13 @@ public class StudentPaymentOrderController extends BaseController {
                 }
             }
         }
-        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if(userIds.size() >0){
-                queryInfo.setUserIds(userIds);
+            if (userIds.size() <= 0) {
+                userIds.add(0);
             }
+            queryInfo.setUserIds(userIds);
         }
 
         PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);

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

@@ -69,12 +69,13 @@ public class StudentPaymentRouteOrderController extends BaseController {
                 }
             }
         }
-        if(StringUtils.isNotBlank(queryInfo.getSearch())){
+        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
-            if(userIds.size() >0){
-                queryInfo.setUserIds(userIds);
+            if (userIds.size() <= 0) {
+                userIds.add(0);
             }
+            queryInfo.setUserIds(userIds);
         }
 
         PageInfo<StudentPaymentRouteOrderDto> studentPaymentRouteOrderPageInfo = studentPaymentRouteOrderService.OrderQueryPage(queryInfo);