|
@@ -6,6 +6,7 @@ import com.cy.guoyan.admin.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
import com.cy.guoyan.admin.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
import com.cy.guoyan.admin.module.guoyan.controller.admin.researchtopiccategory.vo.ResearchTopicCategoryPageReqVO;
|
|
|
import com.cy.guoyan.admin.module.guoyan.dal.dataobject.researchtopiccategory.ResearchTopicCategoryDO;
|
|
|
+import com.cy.guoyan.admin.module.guoyan.dal.dataobject.researchtopicinfo.ResearchTopicInfoDO;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import javax.annotation.Resource;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -83,7 +84,7 @@ public class StateOwnedReformLawCategoryServiceImpl implements StateOwnedReformL
|
|
|
|
|
|
StateOwnedReformLawCategoryDO old = stateOwnedReformLawCategoryMapper.selectById(updateReqVO.getId());
|
|
|
if (old== null) {
|
|
|
- throw exception(RESEARCH_TOPIC_CATEGORY_NOT_EXISTS);
|
|
|
+ throw exception(STATE_OWNED_REFORM_LAW_CATEGORY_NOT_EXISTS);
|
|
|
}
|
|
|
|
|
|
if (old.getLevel() == 1) {
|
|
@@ -127,7 +128,7 @@ public class StateOwnedReformLawCategoryServiceImpl implements StateOwnedReformL
|
|
|
|
|
|
StateOwnedReformLawCategoryDO old = stateOwnedReformLawCategoryMapper.selectById(id);
|
|
|
if (old == null) {
|
|
|
- throw exception(RESEARCH_TOPIC_CATEGORY_NOT_EXISTS);
|
|
|
+ throw exception(STATE_OWNED_REFORM_LAW_CATEGORY_NOT_EXISTS);
|
|
|
}
|
|
|
|
|
|
if (old.getLevel() == 1) {
|
|
@@ -186,6 +187,16 @@ public class StateOwnedReformLawCategoryServiceImpl implements StateOwnedReformL
|
|
|
return buildTree(categoryDOS);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void voidStateOwnedReformLawCategory(Long id, String status) {
|
|
|
+ StateOwnedReformLawCategoryDO infoDO = stateOwnedReformLawCategoryMapper.selectById(id);
|
|
|
+ if (infoDO == null) {
|
|
|
+ throw exception(STATE_OWNED_REFORM_LAW_CATEGORY_NOT_EXISTS);
|
|
|
+ }
|
|
|
+ infoDO.setStatus(status);
|
|
|
+ stateOwnedReformLawCategoryMapper.updateById(infoDO);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 根据 categoryCode / parentCode 构建树,并按 order1 → order2 排序
|
|
|
*/
|