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

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

@@ -312,7 +312,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
             if (wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimTeacher.getCode())
                     && ObjectUtil.isNotNull(wfTextbookClaim.getApplicantUserId())
                     && ObjectUtil.isNotNull(wfTextbookClaim.getClaimUserId())
-                    && wfTextbookClaim.getApplicantUserId().equals(wfTextbookClaim.getClaimUserId())) {
+                    && !wfTextbookClaim.getApplicantUserId().equals(wfTextbookClaim.getClaimUserId())) {
                 textbookClaimUserList.add(new TextbookClaimUser() {{
                     setWfTextbookClaimId(wfTextbookClaim.getId());
                     setUserId(wfTextbookClaim.getClaimUserId());

src/main/resources/application-dev.yml

@@ -65,7 +65,8 @@ xjrsoft:
     default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
     domain-api: http://10.150.10.139:8888/api #api域名地址
 #    domain-app: https://yxh-web.ngrok.yingcaibx.com/# #app域名地址
-    domain-app: http://172.19.17.106:5173/app/# #app域名地址
+    #domain-app: http://172.19.17.106:5173/app/# #app域名地址
+    domain-app: http://10.150.10.139:8888/app/# #app域名地址
     domain-web: http://10.150.10.139:8888 #web域名地址
 #    domain-api: http://127.0.0.1:9000/api #api域名地址
 #    domain-web: http://127.0.0.1:9000 #web域名地址

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

@@ -19,6 +19,6 @@ class WfTextbookRecedeServiceImplTest {
 
     @Test
     void dataHandle() {
-        wfTextbookRecedeService.dataHandle(1743226403487281152L);
+        wfTextbookRecedeService.dataHandle(1743231402795659264L);
     }
 }