feat: 各业务模块增加“创建人”查询条件

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -56,9 +56,9 @@ public class CompanyController {
                                                      @RequestParam(required = false) String loginUserID, @RequestParam(required = false) String siteID,
                                                      @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate,
                                                      @RequestParam(required = false) String postCountSorter,@RequestParam(required = false)String companyTypeID,
-                                                     @RequestParam(required = false)String industryID) { //loginUserID暂用来过滤app的当前登录人驿站的企业信息
+                                                     @RequestParam(required = false)String industryID, @RequestParam(required = false) String createUserName) { //loginUserID暂用来过滤app的当前登录人驿站的企业信息
 
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, loginUserID, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, loginUserID, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID, createUserName);
 
         return RespGenerstor.success(result);
     }
@@ -163,8 +163,9 @@ public class CompanyController {
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode,
                                @RequestParam(required = false) String siteID, @RequestParam(required = false) Date startDate,
                                @RequestParam(required = false) Date endDate,@RequestParam(required = false) String postCountSorter,
-                               @RequestParam(required = false)String companyTypeID,@RequestParam(required = false)String industryID) throws Exception {
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null, null, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID);
+                               @RequestParam(required = false)String companyTypeID,@RequestParam(required = false)String industryID,
+                               @RequestParam(required = false) String createUserName) throws Exception {
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null, null, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID, createUserName);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -44,9 +44,10 @@ public class PostController {
                                 @RequestParam(required = false) String loginUserID,
                                 @RequestParam(required = false) String siteID,
                                 @RequestParam(required = false) Date startDate,
-                                @RequestParam(required = false) Date endDate) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+                                @RequestParam(required = false) Date endDate,
+                                @RequestParam(required = false) String createUserName) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, companyID, loginUserID, siteID, startDate, endDate);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, companyID, loginUserID, siteID, startDate, endDate, createUserName);
         return RespGenerstor.success(result);
     }
 
@@ -117,7 +118,7 @@ public class PostController {
     @GetMapping("/getPostsByCompanyID")
     public BaseResponse<List<PostVo>> getPostsByCompanyID(@RequestParam(required = false) String companyId) {
 //        var dataList = postService.getDataListByCompanyID(companyId);
-        PageInfo<PostVo> result = postService.getList(1, 99999, null, null, null, null, null, null, companyId, null, null, null, null);
+        PageInfo<PostVo> result = postService.getList(1, 99999, null, null, null, null, null, null, companyId, null, null, null, null, null);
         return RespGenerstor.success(result.getList());
     }
 
@@ -151,8 +152,9 @@ public class PostController {
                                @RequestParam(required = false) String recordStatus,
                                @RequestParam(required = false) String siteID,
                                @RequestParam(required = false) Date startDate,
-                               @RequestParam(required = false) Date endDate) throws Exception {
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, null, null, siteID, startDate, endDate);
+                               @RequestParam(required = false) Date endDate,
+                               @RequestParam(required = false) String createUserName) throws Exception {
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, null, null, siteID, startDate, endDate, createUserName);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -53,13 +53,14 @@ public class JobHuntController {
                                 @RequestParam(required = false) String regionCode,
                                 @RequestParam(required = false) Date startDate,
                                 @RequestParam(required = false) Date endDate,
-                                @RequestParam(required = false) boolean isAllJobHunt) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+                                @RequestParam(required = false) boolean isAllJobHunt,
+                                @RequestParam(required = false) String createUserName) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
         PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize, jobHuntIDList, jobUserID,
                 jobUserName, professionName, minWorkYear, maxWorkYear,
                 jobHuntTypeID, jobUserTypeID, minSalary, maxSalary,
                 isAccomplish, loginUserID, siteID, regionCode,
-                startDate, endDate,isAllJobHunt);
+                startDate, endDate,isAllJobHunt, createUserName);
         return RespGenerstor.success(result);
     }
 
@@ -130,12 +131,13 @@ public class JobHuntController {
                                @RequestParam(required = false) BigDecimal minSalary, @RequestParam(required = false) BigDecimal maxSalary,
                                @RequestParam(required = false) Integer isAccomplish, @RequestParam(required = false) String siteID,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) Date startDate,
-                               @RequestParam(required = false) Date endDate,@RequestParam(required = false) boolean isAllJobHunt) throws Exception {
+                               @RequestParam(required = false) Date endDate,@RequestParam(required = false) boolean isAllJobHunt,
+                               @RequestParam(required = false) String createUserName) throws Exception {
 
         PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize, jobHuntIDList, jobUserID,
                 jobUserName, workName, minWorkYear, maxWorkYear,
                 jobHuntTypeID, jobUserTypeID, minSalary, maxSalary,
-                isAccomplish, null, siteID, regionCode, startDate, endDate, isAllJobHunt);
+                isAccomplish, null, siteID, regionCode, startDate, endDate, isAllJobHunt, createUserName);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "希望工作地区", "可到职日期", "工作年限", "求职类型", "求职岗位", "人才类型", "月薪要求"}));
         int i = 0;

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -56,9 +56,12 @@ public class JobUserController {
                                 @RequestParam(required = false) Integer educationTypeId, @RequestParam(required = false) Integer emphasisTypeId,
                                 @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime,
                                 @RequestParam(required = false) String loginUserID, @RequestParam(required = false) String regionCode,
-                                @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+                                @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate,
+                                @RequestParam(required = false) String createUserName) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, loginUserID, regionCode, startDate, endDate);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId,
+                educationTypeId, emphasisTypeId, createUserId, workTime,
+                loginUserID, regionCode, startDate, endDate, createUserName);
         return RespGenerstor.success(result);
     }
 
@@ -188,8 +191,9 @@ public class JobUserController {
                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteId, @RequestParam(required = false) String jobStatus,
                                @RequestParam(required = false) Integer sexId, @RequestParam(required = false) Integer educationTypeId,
                                @RequestParam(required = false) Integer emphasisTypeId, @RequestParam(required = false) String regionCode,
-                               @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate) throws Exception {
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null, null, regionCode, startDate, endDate);
+                               @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate,
+                               @RequestParam(required = false) String createUserName) throws Exception {
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null, null, regionCode, startDate, endDate, createUserName);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

src/main/java/com/hz/employmentsite/mapper/cquery/CompanyCQuery.java

@@ -16,7 +16,8 @@ public interface CompanyCQuery {
                             @Param("curLoginUserSiteID") String curLoginUserSiteID, @Param("siteID") String siteID,
                             @Param("startDate") Date startDate, @Param("endDate") Date endDate,
                             @Param("postCountSorter") String postCountSorter, @Param("companyTypeID") String companyTypeID,
-                            @Param("industryID") String industryID, @Param("isAllCompany") boolean isAllCompany);
+                            @Param("industryID") String industryID, @Param("isAllCompany") boolean isAllCompany,
+                            @Param("createUserName") String createUserName);
 
     List<PcFirm> getFirmNameLikeList(@Param("firmName") String firmName);
 

src/main/java/com/hz/employmentsite/mapper/cquery/JobHuntCQuery.java

@@ -15,7 +15,8 @@ public interface JobHuntCQuery {
                                    @Param("minSalary") BigDecimal minSalary, @Param("maxSalary") BigDecimal maxSalary,
                                    @Param("isAccomplish") Integer isAccomplish, @Param("curLoginUserSiteJobUserIDs") String curLoginUserSiteJobUserIDs,
                                    @Param("siteID") String siteID, @Param("regionCode") String regionCode,
-                                   @Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("isAllJobHunt") boolean isAllJobHunt);
+                                   @Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("isAllJobHunt") boolean isAllJobHunt,
+                                   @Param("createUserName") String createUserName);
 
     List<JobHuntVo> selectJobHuntInCompanyIDs(@Param("jobUserIDList") String jobUserIDList);
 }

src/main/java/com/hz/employmentsite/mapper/cquery/JobUserCQuery.java

@@ -16,7 +16,8 @@ public interface JobUserCQuery {
                                       @Param("emphasisTypeId") Integer emphasisTypeId, @Param("createUserId") String createUserId,
                                       @Param("workTime") String workTime, @Param("curLoginUserSiteID") String curLoginUserSiteID,
                                       @Param("regionCode") String regionCode, @Param("startDate") Date startDate,
-                                      @Param("endDate") Date endDate,@Param("isAllJobUser") boolean isAllJobUser);
+                                      @Param("endDate") Date endDate,@Param("isAllJobUser") boolean isAllJobUser,
+                                      @Param("createUserName") String createUserName);
 
     List<PcJobuser> getJobUserIdentityNumber();
 

src/main/java/com/hz/employmentsite/mapper/cquery/PostCQuery.java

@@ -14,7 +14,8 @@ public interface PostCQuery {
                                 @Param("companyName") String companyName, @Param("RecordStatus") String RecordStatus,
                                 @Param("companyID") String companyID, @Param("curLoginUserSiteCompanyIDs") String curLoginUserSiteCompanyIDs,
                                 @Param("siteID") String siteID, @Param("startDate") Date startDate,
-                                @Param("endDate") Date endDate,@Param("isAllPost") boolean isAllPost);
+                                @Param("endDate") Date endDate,@Param("isAllPost") boolean isAllPost,
+                                @Param("createUserName") String createUserName);
 
     List<RecommendPostVo> selectRecommendPostList(@Param("jobUserID") String jobUserID);
 

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -92,7 +92,7 @@ public class CompanyServiceImpl implements CompanyService {
                                        String regionCode, String streetCode,
                                        String createUserId, String workTime, String loginUserID,
                                        String siteID, Date startDate, Date endDate, String postCountSorter,
-                                       String companyTypeID,String industryID) {
+                                       String companyTypeID,String industryID, String createUserName) {
         String curLoginUserSiteID = "";
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -100,7 +100,12 @@ public class CompanyServiceImpl implements CompanyService {
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, curLoginUserSiteID, siteID, startDate, endDate, postCountSorter, companyTypeID, industryID,false);
+        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode,
+                recordStatus, regionCode, streetCode,
+                createUserId, workTime, curLoginUserSiteID,
+                siteID, startDate, endDate, postCountSorter,
+                companyTypeID, industryID,false,
+                createUserName);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }
@@ -332,7 +337,7 @@ public class CompanyServiceImpl implements CompanyService {
             return null;
         }
 
-        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null,null,null, isAllCompany).stream().findFirst().orElse(null);
+        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null,null,null, isAllCompany, null).stream().findFirst().orElse(null);
         if(data!=null){
             data.listLabel = labelCQuery.getCompanyLabelList(id);
         }

src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -72,7 +72,7 @@ public class PostServiceImpl implements PostService {
                                     String professionName, Integer minCount, Integer maxCount,
                                     String companyName, String recordStatus, String companyID,
                                     String loginUserID, String siteID, Date startDate,
-                                    Date endDate) {
+                                    Date endDate, String createUserName) {
         List<String> curLoginUserSiteCompanyIDs = new ArrayList<>();
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -86,7 +86,9 @@ public class PostServiceImpl implements PostService {
             }
         }
         PageHelper.startPage(page, rows);
-        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus, companyID, stringUtils.ListToInSql(curLoginUserSiteCompanyIDs), siteID, startDate, endDate,false);
+        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount,
+                companyName, recordStatus, companyID, stringUtils.ListToInSql(curLoginUserSiteCompanyIDs),
+                siteID, startDate, endDate,false, createUserName);
         if(list != null && list.size()>0){
             for(PostVo curPost : list){
                 curPost.listLabel = labelCQuery.getPostLabelList(curPost.getPostID());
@@ -322,7 +324,7 @@ public class PostServiceImpl implements PostService {
         PcPostExample postExp = new PcPostExample();
         postExp.or().andPostIDIn(idList);
         // 查询岗位的相关企业
-        List<PostVo> postVos = postCQuery.selectPostList(stringUtils.ListToInSql(idList), null, null, null, null, null, null, null, null, null, null, false);
+        List<PostVo> postVos = postCQuery.selectPostList(stringUtils.ListToInSql(idList), null, null, null, null, null, null, null, null, null, null, false, null);
         // 记录删除数据
         String delInfo = "删除岗位：";
         for (PostVo post : postVos) {
@@ -360,7 +362,7 @@ public class PostServiceImpl implements PostService {
             labelEmp.or().andPostIDEqualTo(id);
             pcLabelPostMapper.deleteByExample(labelEmp);
             // 查询岗位的相关企业
-            List<PostVo> postVos = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, false);
+            List<PostVo> postVos = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, false, null);
             // 记录删除数据
             String delInfo = "删除岗位：";
             for (PostVo post : postVos) {
@@ -393,7 +395,7 @@ public class PostServiceImpl implements PostService {
             return null;
         }
 
-        PostVo data = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null,isAllPost).stream().findFirst().orElse(null);
+        PostVo data = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null,isAllPost,null).stream().findFirst().orElse(null);
         if (data != null) {
             data.listLabel = labelCQuery.getPostLabelList(id);
         }

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -57,7 +57,8 @@ public class JobHuntServiceImpl implements JobHuntService {
     public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                        BigDecimal minWorkYear, BigDecimal maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                        BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID,
-                                       String siteID, String regionCode, Date startDate, Date endDate,boolean isAllJobHunt) {
+                                       String siteID, String regionCode, Date startDate, Date endDate,boolean isAllJobHunt,
+                                       String createUserName) {
         List<String> curLoginUserSiteJobUserIDs = new ArrayList<>();
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -80,7 +81,7 @@ public class JobHuntServiceImpl implements JobHuntService {
                     professionName, minWorkYear, maxWorkYear,
                     jobHuntTypeID, jobUserTypeID, minSalary,
                     maxSalary, isAccomplish, stringUtils.ListToInSql(curLoginUserSiteJobUserIDs),
-                    siteID, regionCode, startDate, endDate, isAllJobHunt);
+                    siteID, regionCode, startDate, endDate, isAllJobHunt, createUserName);
         }
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -96,7 +97,7 @@ public class JobHuntServiceImpl implements JobHuntService {
             ids.add(jobHuntId);
         }
         JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids), null, null, null, null, null,
-                null, null, null, null, null, null, null, null, null, null,true).stream().findFirst().orElse(null);
+                null, null, null, null, null, null, null, null, null, null,true, null).stream().findFirst().orElse(null);
         return model;
     }
 
@@ -113,7 +114,7 @@ public class JobHuntServiceImpl implements JobHuntService {
                 null, null, null,
                 null, null, null,
                 null, null, null,
-                null, null, null, null, false);
+                null, null, null, null, false, null);
         String delInfo = "删除求职意向：";
         for (JobHuntVo item : jobHuntList) {
             delInfo += item.getJobUserName() + "("+item.getProfessionName() + ")，";
@@ -147,7 +148,7 @@ public class JobHuntServiceImpl implements JobHuntService {
                     null, null, null,
                     null, null, null,
                     null, null, null,
-                    null, null, null, null, false);
+                    null, null, null, null, false,null);
             // 删除求职意向
             int result = pcJobhuntMapper.deleteByPrimaryKey(id);
             if (result > 0) {

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -95,7 +95,7 @@ public class JobUserServiceImpl implements JobUserService {
                                        Integer emphasisTypeId, String createUserId,
                                        String workTime, String loginUserID,
                                        String regionCode, Date startDate,
-                                       Date endDate) {
+                                       Date endDate, String createUserName) {
         String curLoginUserSiteID = "";
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -103,7 +103,10 @@ public class JobUserServiceImpl implements JobUserService {
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID, regionCode, startDate, endDate, false);
+        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId,
+                educationTypeId, emphasisTypeId, createUserId, workTime,
+                curLoginUserSiteID, regionCode, startDate, endDate, false,
+                createUserName);
         // 信息脱敏
         list.forEach(item -> {
             item.setUserMobile(calculateUtils.maskMobile(desUtils.decoderText(item.getUserMobile())));
@@ -190,7 +193,7 @@ public class JobUserServiceImpl implements JobUserService {
             return null;
         }
 
-        JobUserVo data = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null,null,null,null,null,isAllJobUser).stream().findFirst().orElse(null);
+        JobUserVo data = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null,null,null,null,null,isAllJobUser, null).stream().findFirst().orElse(null);
         if(data!=null){
             data.listLabel = labelCQuery.getUserLabelList(id);
             data.setAge(calculateUtils.calculateAge(desUtils.decoderText(data.getIdentityNumber())));

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -20,7 +20,7 @@ public interface CompanyService {
                                 String regionCode, String streetCode,
                                 String createUserId, String workTime, String loginUserID,
                                 String siteID, Date startDate, Date endDate, String postCountSorter,
-                                String companyTypeID,String industryID);
+                                String companyTypeID,String industryID, String createUserName);
 
     PageInfo<PcFirm> getFirmNameLikeList(Integer pageIndex, Integer pageSize, String PcFirm);
 

src/main/java/com/hz/employmentsite/services/service/companyService/PostService.java

@@ -13,7 +13,7 @@ public interface PostService {
                              String professionName, Integer minCount, Integer maxCount,
                              String companyName, String RecordStatus, String companyID,
                              String loginUserID, String siteID, Date startDate,
-                             Date endDate);
+                             Date endDate, String createUserName);
 
     PageInfo<RecommendPostVo> getCommendPostList(Integer page, Integer rows, String jobUserID);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobHuntService.java

@@ -13,7 +13,8 @@ public interface JobHuntService {
     PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                 BigDecimal minWorkYear, BigDecimal maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                 BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID,
-                                String siteID, String regionCode, Date startDate, Date endDate,boolean isAllJobHunt);
+                                String siteID, String regionCode, Date startDate, Date endDate,boolean isAllJobHunt,
+                                String createUserName);
 
     JobHuntVo get(String jobHuntId);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobUserService.java

@@ -20,7 +20,7 @@ public interface JobUserService {
                                 Integer emphasisTypeId, String createUserId,
                                 String workTime, String loginUserID,
                                 String regionCode, Date startDate,
-                                Date endDate);
+                                Date endDate, String createUserName);
 
     int setJobUserDes();
 

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -58,6 +58,7 @@ public class CompanyVo {
     public String recordStatusName;
 
     public String createUserID;
+    public String createUserName;
 
     public Date createTime;
 
@@ -77,8 +78,6 @@ public class CompanyVo {
 
     public String companyDesc;
 
-    public String createUserName;
-
     public int postCount;
 
     public String longitude;

src/main/java/com/hz/employmentsite/vo/companyService/PostVo.java

@@ -82,6 +82,7 @@ public class PostVo {
     public BigDecimal trailMinSalary;
 
     public String createUserID;
+    public String createUserName;
 
     public Date createTime;
 

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserVo.java

@@ -107,6 +107,7 @@ public class JobUserVo {
     private String personalSkills;
 
     private String createUserID;
+    public String createUserName;
     private Date createTime;
     private String modifyUserID;
     private String modifyUserName;

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -8,7 +8,7 @@
         ,inSites.InstitutionID as institutionID,site.SiteName,com_status.Name as recordStatusName,
         industry.industryName as industryName,industry.industryName as showIndustryName,
         com_estate.Name as estateCategoryName,com_type.Name as companyTypeName,com_reType.Name as RegisteredCapitalTypeName,
-        com_tag.Name as tagName,com_short.Name as isShortageName,modifyUser.Name as modifyUserName
+        com_tag.Name as tagName,com_short.Name as isShortageName,modifyUser.Name as modifyUserName, createUser.`Name` as createUserName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
         left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on
@@ -32,6 +32,7 @@
         left join pc_site site on company.siteID = site.siteID
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
+        left join sys_user createUser on company.CreateUserID = createUser.UserID
         left join sys_user modifyUser on company.ModifyUserID = modifyUser.UserID
         left join (select CompanyID, count(1) as postCount from pc_post group by CompanyID) postCountData on postCountData.CompanyID = company.CompanyID
         where 1=1
@@ -84,6 +85,9 @@
         <if test="isAllCompany != null and isAllCompany == true ">
             or company.companyID = 'AllCompany'
         </if>
+        <if test="createUserName!='' and createUserName!=null">
+            and createUser.`Name` like Concat('%',#{createUserName},'%')
+        </if>
         order by
         <if test="postCountSorter == null or postCountSorter == ''">
             company.CreateTime desc,

src/main/resources/mapping/cquery/JobHuntCQuery.xml

@@ -23,6 +23,7 @@
         left join (select * from sys_dictionary_item where DictionaryCode ='JobHuntType') dic_huntJobType on
         jobHunt.JobHuntType = dic_huntJobType.value
         left join sys_user modifyUser on jobHunt.ModifyUserID = modifyUser.UserID
+        left join sys_user createUser on jobHunt.CreateUserID = createUser.UserID
         where 1=1
         <if test="jobHuntIDList != '' and jobHuntIDList != null">
             and jobHunt.JobHuntID in (${jobHuntIDList})
@@ -80,6 +81,9 @@
             and jobHunt.CreateTime <![CDATA[ >= ]]> #{startDate}
             and jobHunt.CreateTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="createUserName!='' and createUserName!=null">
+            and createUser.`Name` like Concat('%',#{createUserName},'%')
+        </if>
         <if test="isAllJobHunt != null and isAllJobHunt == true ">
             or jobHunt.JobUserID = 'AllJobUser'
         </if>

src/main/resources/mapping/cquery/JobUserCQuery.xml

@@ -10,7 +10,7 @@
         sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName,occ_cat.OccupationalName as
         occupationalCategoryName,
         sys_occ_level.Name as occupationalLevelName,sys_blood_type.Name as bloodTypeName,sys_marital_status.Name as
-        MaritalStatusName, sys_nation.Name as nationName, modifyUser.Name as modifyUserName,
+        MaritalStatusName, sys_nation.Name as nationName, modifyUser.Name as modifyUserName,createUser.`Name` as createUserName,
         area_region.name as RegionName,area_street.name as StreetName,
         recommendCountData.RecommendedCount,jobhuntCountData.jobHuntCount
         from pc_jobuser jobuser
@@ -46,6 +46,7 @@
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join sys_user modifyUser on jobuser.ModifyUserID = modifyUser.UserID
+        left join sys_user createUser on jobuser.CreateUserID = createUser.UserID
         left join (
         SELECT
         job_user.JobUserID,
@@ -102,6 +103,9 @@
             and jobuser.CreateTime <![CDATA[ >= ]]> #{startDate}
             and jobuser.CreateTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="createUserName!='' and createUserName!=null">
+            and createUser.`Name` like Concat('%',#{createUserName},'%')
+        </if>
         <if test="isAllJobUser != null and isAllJobUser == true ">
             or jobuser.JobUserID = 'AllJobUser'
         </if>

src/main/resources/mapping/cquery/PostCQuery.xml

@@ -11,7 +11,7 @@
         workNatureName,item2.`Name` as workYearName
         , IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
         , company.SiteID, site.SiteName, inSites.InstitutionID, company.RegionCode
-        , pro.ProfessionName,category.workCategoryName, pro.ProfessionID, pro.parentProfessionID, modifyUser.Name as modifyUserName
+        , pro.ProfessionName,category.workCategoryName, pro.ProfessionID, pro.parentProfessionID, modifyUser.Name as modifyUserName, createUser.`Name` as createUserName
         from pc_post post
         left join pc_company company on post.CompanyID = company.CompanyID
         left join sys_dictionary_item item on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'
@@ -25,6 +25,7 @@
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join sys_user modifyUser on post.ModifyUserID = modifyUser.UserID
+        left join sys_user createUser on post.CreateUserID = createUser.UserID
         <where>
             <if test="postIDList != '' and postIDList != null">
                 and post.postID in (${postIDList})
@@ -63,6 +64,9 @@
                 and post.CreateTime <![CDATA[ >= ]]> #{startDate}
                 and post.CreateTime <![CDATA[ <= ]]> #{endDate}
             </if>
+            <if test="createUserName!='' and createUserName!=null">
+                and createUser.`Name` like Concat('%',#{createUserName},'%')
+            </if>
             <if test="isAllPost != null and isAllPost == true ">
                 or post.postID = 'AllPost'
             </if>

vue/src/views/companyService/company/index.vue

@@ -116,6 +116,13 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="创建人" :label-col="{span:6}" name="createUserName">
+            <a-input v-model:value="searchParams.createUserName" placeholder="" :allow-clear="true"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" class="flex-space-between">
           <div>
@@ -202,6 +209,7 @@ export default defineComponent({
       postCountSorter: "",
       companyTypeID:"",
       industryID:"",
+      createUserName: ""
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {

vue/src/views/companyService/post/index.vue

@@ -88,6 +88,13 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="创建人" :label-col="{span:6}" name="createUserName">
+            <a-input v-model:value="searchParams.createUserName" placeholder="" :allow-clear="true"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" class="flex-space-between">
           <div>
@@ -181,7 +188,8 @@ export default defineComponent({
       recordStatus: null,
       siteID: "",
       startDate: "",
-      endDate: ""
+      endDate: "",
+      createUserName: "",
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -140,6 +140,11 @@
                             @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
+        <a-col :span="6">
+          <a-form-item label="创建人" :label-col="{span:8}" name="createUserName">
+            <a-input v-model:value="searchParamsState.createUserName" placeholder="" :allow-clear="true"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" class="flex-space-between">
@@ -236,7 +241,8 @@ export default defineComponent({
       siteID: null,
       regionCode: null,
       startDate: null,
-      endDate: null
+      endDate: null,
+      createUserName: null
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {

vue/src/views/jobUserManager/jobuser/index.vue

@@ -120,6 +120,11 @@
                             @change="onCreateTimeChange"/>
           </a-form-item>
         </a-col>
+        <a-col :span="6">
+          <a-form-item label="创建人" :label-col="{span:8}" name="createUserName">
+            <a-input v-model:value="searchParamsState.createUserName" placeholder="" :allow-clear="true"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" class="flex-space-between">
@@ -218,7 +223,8 @@ export default defineComponent({
       siteID: "",
       startDate: "",
       endDate: "",
-      regionCode: ""
+      regionCode: "",
+      createUserName: ""
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {