项目选择组件

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -69,11 +69,14 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
                 List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(ids)) {
-                    queryWrapper.in("a.create_by", ids);
+                    queryWrapper.in("a.project_master_id", ids);
                 } else {
                     return new Page<>();
                 }
             }
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateId())){
+                queryWrapper.eq("a.create_by", cwProjectRecordsDTO.getCreateId());
+            }
         }
         IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);
         return list;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -6,6 +6,8 @@ import com.jeeplus.core.query.QueryType;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.test.cw.common.flowable.dto.CommitParamDTO;
+import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;
@@ -144,4 +146,14 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 合同名称
      */
     private String contractName;
+
+    /**
+     * 流程通过参数
+     */
+    private CommitParamDTO<CwProjectRecords> commitParamDTO;
+
+    /**
+     * 创建人id
+     */
+    private String createId;
 }