修改模板类型

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeTypeServiceImpl.java

@@ -103,13 +103,13 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
             List<ChangeType> sonChanges = mapper.queryParent(changeParentType.getId());
             for (ChangeType sonChange : sonChanges){
                 if (sonChange.getTypeName().equals(changeTypes.get(1).getTypeName())){
+                    //处理有问题
                     deleteChangeType(changeTypes.get(1));
-                    changeTypes.set(1,sonChange);
-                    return changeTypes;
                 }
             }
             //发现没有直接新增并返回
             changeTypes.get(1).setId(null);
+            changeTypes.set(0,changeParentType);
             changeTypes.get(1).setParentId(changeParentType.getId());
             changeTypes.get(1).setCreateTime(System.currentTimeMillis());
             changeTypes.get(1).setUpdateTime(System.currentTimeMillis());

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeTypeMapper.java

@@ -24,7 +24,7 @@ public interface ChangeTypeMapper extends tk.mybatis.mapper.common.Mapper<Change
     ChangeType queryTypeName(@Param("typeName") String typeName);
 
 
-    @Select("select * from TB_YX_QC_CHANGE_TYPE where id in(#{id},#{sonChangeClassId}) and delete_type  = #{deleteType} ")
+    @Select("select * from TB_YX_QC_CHANGE_TYPE where id in(#{id},#{sonChangeClassId}) and delete_type  = #{deleteType}  order by parent_id ")
     List<ChangeType> queryTypes(
             @Param("id") Long id,
             @Param("sonChangeClassId")Long sonChangeClassId,

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/po/ChangeConfigPo.java

@@ -70,11 +70,6 @@ public class ChangeConfigPo {
     private String participateChangeExecDepartment;
 
     /**
-     *  变更执行部门 是否还有必要存在？？？
-     */
-    ChangeExecConfigPo changeExecConfigPo;
-
-    /**
      * 关联的一级二级类目
      */
     List<ChangeType> changeTypes;