commit

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingMineController.java

@@ -110,7 +110,9 @@ public class CadreTrainingMineController {
             cnd.where().andLike(CadreTrainingAct::getName, pageForm.getSearchKeyword());
         }
         cnd.desc("info.applyTime");
-        cnd.and("info.userId", "=", SecurityUtil.getUserId());
+        // 本人报名和本人代他人报名的记录都应在“我的报名”中展示。
+        cnd.and(Cnd.exps("info.userId", "=", SecurityUtil.getUserId())
+                .or("info.applyUserId", "=", SecurityUtil.getUserId()));
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = cadreTrainingSignUpService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);

src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java

@@ -68,7 +68,8 @@ public class CadreTrainingSignUpController {
     @ApiOperation("分页查询")
     public Result pageData(@Valid PageForm pageForm,Integer year, boolean isEnrolled) {
         Sql sql = Sqls.create("""
-                SELECT
+                -- 同一活动存在多条代报名记录时，活动列表仅展示一次。
+                SELECT DISTINCT
                   info.*,
                   CASE WHEN cts.id IS NOT NULL THEN 1 ELSE 0 END AS isEnrolled
                 FROM
@@ -101,6 +102,9 @@ public class CadreTrainingSignUpController {
         List<ProcessInstance> instances = new ArrayList<>();
 
         for (CadreTrainingSignUp signUp : cadreTrainingSignUps) {
+            // 代报名记录必须以当前登录人为报名操作人，供“已报名”和“我的报名”按操作人查询。
+            signUp.setApplyUserId(SecurityUtil.getUserId());
+            signUp.setApplyUserUserName(SecurityUtil.getUserUsername());
             if (StrUtil.isBlank(signUp.getId())) {
                 signUp.setApplyTime(new Date());
             }