提交代码

hai-bweb/src/main/java/com/bweb/controller/HighActivityInfoController.java

@@ -208,8 +208,15 @@ public class HighActivityInfoController {
                                 @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         {
             try {
+                //发布人员
+                UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
+                if (userInfoModel.getBsCompany() == null) {
+                    log.error("HighActivityInfoController -> editActivityInfo() error!","该主角色没有权限");
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, "");
+                }
 
                 Map<String, Object> map = new HashMap<>();
+                map.put("companyId", userInfoModel.getBsCompany().getId());
                 map.put("title", title);
                 map.put("type", type);
                 map.put("status", status);

hai-service/src/main/java/com/hai/service/impl/HighActivityInfoServiceImpl.java

@@ -86,6 +86,10 @@ public class HighActivityInfoServiceImpl implements HighActivityInfoService {
         HighActivityInfoExample example = new HighActivityInfoExample();
         HighActivityInfoExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(ActivityInfoStatus.status0.getNumber());
 
+        if (MapUtils.getLong(param, "companyId") != null) {
+            criteria.andCompanyIdEqualTo(MapUtils.getLong(param, "companyId"));
+        }
+
         if (StringUtils.isNotBlank(MapUtils.getString(param, "title"))) {
             criteria.andTitleLike("%"+MapUtils.getString(param, "title")+"%");
         }