|
@@ -19,7 +19,6 @@ import com.ruoyi.system.api.domain.MastProject;
|
|
|
import com.ruoyi.system.api.domain.SysDept;
|
|
|
import com.ruoyi.system.api.domain.SysUser;
|
|
|
import com.ruoyi.system.api.model.LoginUser;
|
|
|
-import jdk.internal.jline.internal.Nullable;
|
|
|
import org.aspectj.weaver.loadtime.Aj;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -117,13 +116,10 @@ public class BidCommitteeController extends BaseController
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/findCommitAndExpert")
|
|
|
- public TableDataInfo findCommitAndExpert(@RequestParam("sid") Long sid, @Null @RequestParam("status") Long status)
|
|
|
+ public TableDataInfo findCommitAndExpert(BidCommittee bidCommittee)
|
|
|
{
|
|
|
startPage();
|
|
|
- Map map = new HashMap();
|
|
|
- map.put("sid",sid);
|
|
|
- map.put("status",status);
|
|
|
- List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(map);
|
|
|
+ List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(bidCommittee);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|