Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

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

@@ -67,6 +67,7 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
     public List<ChangeType> updateChangeType(List<ChangeType> changeTypes) {
         //根据传进来的一级ID 和二级ID 进行查询
         List<ChangeType> changeTypeList = mapper.queryTypes(changeTypes.get(0).getId(), changeTypes.get(1).getId(), 0);
+        //如果一级无变化
         if (changeTypeList.get(0).getTypeName().equals(changeTypes.get(0).getTypeName())) {
             if (changeTypeList.get(1).getTypeName().equals(changeTypes.get(1).getTypeName())){
                 //未改变情况直接返回
@@ -74,15 +75,13 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
             }else{
                 //一级未改变  二级发生改变
                 List<ChangeType> sonChanges = mapper.queryParent(changeTypes.get(0).getId());
-                for (ChangeType sonChange : sonChanges){
-                    if (sonChange.getTypeName().equals(changeTypes.get(1).getTypeName())){
-                        deleteChangeType(changeTypes.get(1));
-                        changeTypes.set(1,sonChange);
-                        return changeTypes;
-                    }
+                Optional<ChangeType> sonTypeHave = sonChanges.stream()
+                        .filter(i -> i.getTypeName().equals(changeTypes.get(1).getTypeName())).findAny();
+                if (sonTypeHave.isPresent()) {
+                    throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "二级分类存在");
                 }
                 //删除老的二级，增加新的二级
-                mapper.deleteByPrimaryKey(changeTypes.get(1).getId());
+                deleteChangeType(changeTypeList.get(1));
                 //发现没有直接新增并返回
                 changeTypes.get(1).setId(null);
                 changeTypes.get(1).setParentId(changeTypes.get(0).getId());
@@ -94,7 +93,8 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         }else{
             //查询 所有一级ID 是否有重复的
             ChangeType changeParentType = mapper.queryTypeName(changeTypes.get(0).getTypeName());
-            if (changeParentType == null){
+            if (changeParentType == null) {
+                deleteChangeType(changeTypeList.get(1));
                 //ID置空
                 changeTypes.get(0).setId(null);
                 changeTypes.get(1).setId(null);
@@ -103,15 +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.get(1).setDeleteType(0);
-                }
+            Optional<ChangeType> sonTypeHave = sonChanges.stream()
+                    .filter(i -> i.getTypeName().equals(changeTypes.get(1).getTypeName())).findAny();
+            if (sonTypeHave.isPresent()) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "二级分类存在");
             }
             //删除老的二级，增加新的二级
-            mapper.deleteByPrimaryKey(changeTypes.get(1).getId());
+            deleteChangeType(changeTypeList.get(1));
             //发现没有直接新增并返回
             changeTypes.get(1).setId(null);
             changeTypes.set(0,changeParentType);