|
@@ -22,10 +22,8 @@ import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrumentActivity> implements ReplacementInstrumentActivityService {
|
|
@@ -74,6 +72,10 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
|
|
|
+ if(Objects.nonNull(queryInfo.getCooperationOrganId())){
|
|
|
+ throw new BizException("请指定合作单位");
|
|
|
+ }
|
|
|
+
|
|
|
int count = replacementInstrumentActivityDao.countReplacements(params);
|
|
|
|
|
|
if(queryInfo.getPage()==1){
|