Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -766,7 +766,7 @@ public class UserController {
         ;
         BaseNewStudent baseNewStudent =  baseNewStudentService.getOne(baseNewStudentLambdaQueryWrapper);
         if(ObjectUtils.isNotEmpty(baseNewStudent)){
-            throw new MyException("当前手机号为学生" + user.getName() + "填写的学生手机号，请更换手机号注册！");
+            throw new MyException("当前手机号为学生" + baseNewStudent.getName() + "填写的学生手机号，请更换手机号注册！");
         }
 
         // 验证验证码

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookIssueRecordServiceImpl.java

@@ -190,6 +190,7 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                 .selectAs(TextbookIssueRecord::getActualIssueNumber, CanReturnTextbookListVo::getActualIssueNumber)
                 .leftJoin(Textbook.class, Textbook::getId, TextbookIssueRecord::getTextbookId)
                 .eq(StringUtils.isNotEmpty(dto.getBaseSemesterId()), TextbookIssueRecord::getBaseSemesterId, dto.getBaseSemesterId())
+                .gt(TextbookIssueRecord::getIssueNumber, TextbookIssueRecord::getRecedeNumber)
         ;
 
         // 个人退书

src/test/java/com/xjrsoft/module/textbook/service/impl/TextbookIssueRecordServiceImplTest.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.textbook.service.impl;
 
+import com.xjrsoft.module.textbook.dto.CanReturnTextbookListDto;
 import com.xjrsoft.module.textbook.dto.TextbookClaimRecordExportDto;
 import com.xjrsoft.module.textbook.service.ITextbookIssueRecordService;
 import com.xjrsoft.module.textbook.service.ITextbookService;
@@ -21,4 +22,13 @@ class TextbookIssueRecordServiceImplTest {
     void claimRecordExportDataQuery() throws IOException {
         textbookIssueRecordService.claimRecordExportDataQuery(new TextbookClaimRecordExportDto());
     }
+
+    @Test
+    void canReturnTextbookList() {
+        textbookIssueRecordService.canReturnTextbookList(new CanReturnTextbookListDto(){{
+            setApplicantUserId("654321987654918");
+            setRecordType(0);
+            setBaseSemesterId("1868532124600545280");
+        }});
+    }
 }