DeBugDeBugDeBug

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -103,7 +103,7 @@ public class SysDeptController extends BaseController {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(getUsername());
-        return toAjax(deptService.insertDept(dept));
+        return deptService.insertDept(dept);
     }
 
     /**

purchase-admin/src/main/resources/application.yml

@@ -10,5 +10,5 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,test
-#    active: prod
+#    active: druid,test
+    active: prod

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -7,8 +7,12 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import nonapi.io.github.classgraph.json.Id;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.core.domain.BaseEntity;
@@ -18,20 +22,31 @@ import com.ozs.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysDept extends BaseEntity
-{
+@TableName(value = "sys_dept")
+public class SysDept extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
+    /**
+     * 主键编号
+     */
+    @Id
+    @TableId(type = IdType.AUTO)
     private Long deptId;
 
-    /** 父部门ID */
+    /**
+     * 父部门ID
+     */
     private Long parentId;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     private String deptName;
 
     /** 显示顺序 */

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -685,9 +685,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 for (SysFileRef fileRef : fileRefs) {
                     fileRef.setId(null);
                     fileRef.setRedId(quarter.getPlanPracticalId());
-                    fileRef.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                    fileRef.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
                     fileRef.setCreateTime(now);
                     fileRef.setCreated(SecurityUtils.getUserId() + "");
+                    sysFileRefMapper.insert(fileRef);
                 }
 
             }

purchase-system/src/main/java/com/ozs/system/mapper/SysDeptMapper.java

@@ -99,7 +99,7 @@ public interface SysDeptMapper {
      * @param dept 部门信息
      * @return 结果
      */
-    public int insertDept(SysDept dept);
+    public Integer insertDept(SysDept dept);
 
     /**
      * 修改部门信息

purchase-system/src/main/java/com/ozs/system/service/ISysDeptService.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.TreeSelect;
 import com.ozs.common.core.domain.entity.SysDept;
 
@@ -114,7 +115,7 @@ public interface ISysDeptService {
      * @param dept 部门信息
      * @return 结果
      */
-    public int insertDept(SysDept dept);
+    public AjaxResult insertDept(SysDept dept);
 
     /**
      * 修改保存部门信息

purchase-system/src/main/java/com/ozs/system/service/impl/SysDeptServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.exception.base.BaseException;
@@ -248,14 +249,15 @@ public class SysDeptServiceImpl implements ISysDeptService {
      * @return 结果
      */
     @Override
-    public int insertDept(SysDept dept) {
+    public AjaxResult insertDept(SysDept dept) {
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
         if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
             throw new ServiceException("部门停用，不允许新增");
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        return deptMapper.insertDept(dept);
+        Integer dept1 = deptMapper.insertDept(dept);
+        return AjaxResult.success(dept.getDeptId());
     }
 
     /**

purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -137,7 +137,8 @@
         where dept_name = #{deptName}
     </select>
 
-    <insert id="insertDept" parameterType="SysDept">
+    <insert id="insertDept" parameterType="com.ozs.common.core.domain.entity.SysDept" useGeneratedKeys="true"
+            keyProperty="deptId">
         insert into sys_dept(
         <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="parentId != null and parentId != 0">parent_id,</if>