修改国企改革法规主题层级

guoyan-module-system/src/main/java/com/cy/guoyan/admin/module/guoyan/controller/admin/stateownedreformlawlevel/vo/StateOwnedReformLawLevelSaveReqVO.java

@@ -17,7 +17,7 @@ public class StateOwnedReformLawLevelSaveReqVO {
     private String oid;
 
     @Schema(description = "层级编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "层级编号不能为空")
+//    @NotNull(message = "层级编号不能为空")
     private Integer levelCode;
 
     @Schema(description = "层级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@@ -35,7 +35,7 @@ public class StateOwnedReformLawLevelSaveReqVO {
     private String updaterName;
 
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "状态不能为空")
+//    @NotEmpty(message = "状态不能为空")
     private String status;
 
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "1104")

guoyan-module-system/src/main/java/com/cy/guoyan/admin/module/guoyan/service/stateownedreformlawlevel/StateOwnedReformLawLevelServiceImpl.java

@@ -1,24 +1,19 @@
 package com.cy.guoyan.admin.module.guoyan.service.stateownedreformlawlevel;
 
 import cn.hutool.core.collection.CollUtil;
-import com.cy.guoyan.admin.module.guoyan.dal.dataobject.stateownedreformlawcategory.StateOwnedReformLawCategoryDO;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
+import com.cy.guoyan.admin.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cy.guoyan.admin.framework.security.core.util.SecurityFrameworkUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
 import com.cy.guoyan.admin.module.guoyan.controller.admin.stateownedreformlawlevel.vo.*;
 import com.cy.guoyan.admin.module.guoyan.dal.dataobject.stateownedreformlawlevel.StateOwnedReformLawLevelDO;
 import com.cy.guoyan.admin.framework.common.pojo.PageResult;
-import com.cy.guoyan.admin.framework.common.pojo.PageParam;
 import com.cy.guoyan.admin.framework.common.util.object.BeanUtils;
-
 import com.cy.guoyan.admin.module.guoyan.dal.mysql.stateownedreformlawlevel.StateOwnedReformLawLevelMapper;
-
 import static com.cy.guoyan.admin.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.cy.guoyan.admin.framework.common.util.collection.CollectionUtils.convertList;
-import static com.cy.guoyan.admin.framework.common.util.collection.CollectionUtils.diffList;
 import static com.cy.guoyan.admin.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -35,8 +30,21 @@ public class StateOwnedReformLawLevelServiceImpl implements StateOwnedReformLawL
 
     @Override
     public Long createStateOwnedReformLawLevel(StateOwnedReformLawLevelSaveReqVO createReqVO) {
+        StateOwnedReformLawLevelDO categoryDO = stateOwnedReformLawLevelMapper.selectOne(
+                new LambdaQueryWrapperX<StateOwnedReformLawLevelDO>()
+                        .orderByDesc(StateOwnedReformLawLevelDO::getLevelCode)
+                        .last("LIMIT 1")
+        );
+        Integer levelCode = categoryDO.getLevelCode();
+        levelCode++;
+        String nickname = String.valueOf(SecurityFrameworkUtils.getLoginUser().getInfo().get("nickname"));
+        createReqVO.setStatus("正常");
         // 插入
         StateOwnedReformLawLevelDO stateOwnedReformLawLevel = BeanUtils.toBean(createReqVO, StateOwnedReformLawLevelDO.class);
+        stateOwnedReformLawLevel.setCreatorName(nickname);
+        DefaultIdentifierGenerator generator = new DefaultIdentifierGenerator();
+        stateOwnedReformLawLevel.setId(generator.nextId(null));
+        stateOwnedReformLawLevel.setLevelCode(levelCode);
         stateOwnedReformLawLevelMapper.insert(stateOwnedReformLawLevel);
         // 返回
         return stateOwnedReformLawLevel.getId();