Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -140,7 +140,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 			ExpGroup expGroup = new ExpGroup();
 			QueryWrapper<ExpGroup> queryWrappereg = QueryGenerator.initQueryWrapper(expGroup, req.getParameterMap());
 			queryWrappereg.eq("grouid",listce.get(i).getExpid());
-			//queryWrappereg.eq("ann_comp_groupid",ndbsxzid);
+			queryWrappereg.eq("ann_comp_groupid",ndbsxzid);
 			List<ExpGroup> listeg = expGroupService.list(queryWrappereg);
 			if(listeg.size()==0){
 				expids = expids+listce.get(i).getExpid()+",";
@@ -447,7 +447,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 }
 		 return result;
 	 }
-	 
+
 
     /**
     * 导出excel模板