更新upgrade中修改sole

(cherry picked from commit 9d4fc0b4)

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090901.java → o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090901.java

-package com.x.general.assemble.control.jaxrs.update;
+package com.x.general.assemble.control.jaxrs.upgrade;
 
 import java.util.List;
 

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090902.java → o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090902.java

-package com.x.general.assemble.control.jaxrs.update;
+package com.x.general.assemble.control.jaxrs.upgrade;
 
 import java.util.List;
 
+import org.apache.commons.lang3.BooleanUtils;
+
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.project.http.ActionResult;
@@ -20,7 +22,10 @@ public class Action2021090902 extends BaseAction {
 			emc.beginTransaction(Route.class);
 
 			for (Route route : list) {
-				if (null != route.getProperties().getSoleDirect()) {
+				if (BooleanUtils.isTrue(route.getProperties().getSoleDirect())
+						&& BooleanUtils.isTrue(route.getSole())) {
+					route.getProperties().setSoleDirect(true);
+				} else {
 					route.getProperties().setSoleDirect(false);
 				}
 			}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/BaseAction.java → o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/BaseAction.java

-package com.x.general.assemble.control.jaxrs.update;
+package com.x.general.assemble.control.jaxrs.upgrade;
 
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/UpgradeAction.java → o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/UpgradeAction.java

-package com.x.general.assemble.control.jaxrs.update;
+package com.x.general.assemble.control.jaxrs.upgrade;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;