--no commit message

com.zrqx.school.sysuser/.project

@@ -30,6 +30,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.genuitec.eclipse.springframework.springnature</nature>

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java

@@ -44,6 +44,7 @@ import com.zrqx.core.vo.schoolsysuser.fg.biddingflow.CycleStatusAndFlowCodeVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
 import com.zrqx.school.sysuser.client.BgMemberClient;
 import com.zrqx.school.sysuser.client.FgMemberClient;
+import com.zrqx.school.sysuser.manage.biddingcycle.BiddingCycleManage;
 import com.zrqx.school.sysuser.manage.dictionarydata.FgDictionaryDataManage;
 import com.zrqx.school.sysuser.manage.export.ExportManage;
 import com.zrqx.school.sysuser.manage.major.FgMajorManage;
@@ -119,6 +120,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 	private BiddingFlowService biddingFlowService;
 	@Autowired
 	private FgMajorMapper fgMajorMapper;
+	@Autowired
+	private BiddingCycleManage cycleManage;
 	
 	
 	
@@ -212,11 +215,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 	
 	@Override
 	public boolean batchDelete(List<Integer> ids) {
-		CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfigTwo();
-		if(biddingConfig != null){
-			if("0".equals(biddingConfig.getStatus())){
-				throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
-			}
+		if(cycleManage.biddingCycleIsExsit()){
+			throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
 		}
 		List<Integer> list = new ArrayList<Integer>();
 		ids.forEach(vo ->{