教材申领流程审核同意完成后添加领取人

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

@@ -97,6 +97,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
                 .eq(ObjectUtils.isNotEmpty(dto.getSubjectGroupId()), Textbook::getSubjectGroupId, dto.getSubjectGroupId())
                 .eq(ObjectUtils.isNotEmpty(dto.getCourseSubjectId()), Textbook::getCourseSubjectId, dto.getCourseSubjectId())
                 .like(StringUtils.isNotEmpty(dto.getBookName()), Textbook::getBookName, dto.getBookName())
+                .orderByDesc(TextbookWarehouseRecord::getCreateDate)
                 ;
         return this.selectJoinListPage(ConventPage.getPage(dto), TextbookWarehouseRecordPageVo.class, textbookWarehouseRecordMPJLambdaWrapper);
 //        return textbookWarehouseRecordMapper.getPage(page, dto);

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

@@ -15,6 +15,9 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.SortCodeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.organization.entity.Role;
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
+import com.xjrsoft.module.organization.mapper.RoleMapper;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
@@ -61,6 +64,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
 
     private final WorkflowFormRelationMapper workflowFormRelationMapper;
     private final TextbookWarehouseRecordMapper textbookWarehouseRecordMapper;
+    private final RoleMapper roleMapper;
 
     @Override
     public IPage<DistributePageVo> distributePageVo(DistributePageDto dto) {
@@ -451,17 +455,17 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
             //所有需要添加的可领取人ID
             List<TextbookClaimUser> textbookClaimUserList = new ArrayList<>();
 
-            List<String> roleList = StpUtil.getRoleList();
-
             //申领人自己可以领取
             textbookClaimUserList.add(new TextbookClaimUser() {{
                 setCreateDate(new Date());
                 setWfTextbookClaimId(wfTextbookClaim.getId());
                 setUserId(wfTextbookClaim.getApplicantUserId());
-                if(roleList.contains(RoleEnum.TEACHER.getCode().toString())){
+                if(ClaimTypeEnum.ClaimTeacher.getCode().equals(wfTextbookClaim.getClaimType())
+                    || ClaimTypeEnum.ClaimClass.getCode().equals(wfTextbookClaim.getClaimType())
+                ){
                     setUserType(2);
                 }
-                if(roleList.contains(RoleEnum.STUDENT.getCode().toString())){
+                if(ClaimTypeEnum.ClaimStudent.getCode().equals(wfTextbookClaim.getClaimType())){
                     setUserType(1);
                 }
             }});
@@ -498,5 +502,4 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
         }
         return true;
     }
-
 }

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

@@ -18,7 +18,7 @@ class WfTextbookClaimServiceImplTest {
     private IWfTextbookClaimService wfTextbookClaimService;
     @Test
     void dataHandleAddClaimUserNode() {
-        wfTextbookClaimService.dataHandleAddClaimUserNode(1889935007730941952L);
+        wfTextbookClaimService.dataHandleAddClaimUserNode(1890241242510442496L);
     }
 
 }