bugFix 解决冲突不正确的问题

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -1078,17 +1078,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 //                        LOCKMARK_N : LOCKMARK_Y);
 //            }
             if (PROCESS_WAY_MERGE.equals(processway)) {
-                if (!info.getPlanstartdate().equals(newPlanStartDate)) {
-                    info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
-                    info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
-                            StringUtils.isBlank(info.getSoftconflictdes()) ?
-                            LOCKMARK_N : LOCKMARK_Y);
-                }else{
-                    info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
-                    info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
-                            StringUtils.isBlank(info.getSoftconflictdes()) ?
-                            LOCKMARK_N : LOCKMARK_Y);
-                }
+                info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+                info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
+                        StringUtils.isBlank(info.getSoftconflictdes()) ?
+                        LOCKMARK_N : LOCKMARK_Y);
             } else {
                 if (newPlanStartDate.compareTo(info.getPlanenddate()) > 0 ||
                         newOldEndDate.compareTo(info.getPlanstartdate()) < 0) {