no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -204,8 +204,8 @@ public class ChangeOrderLogic {
                 pgOrderBase1.setIsMeet(false);
                 pgOrderBase1.updateById();
             }
-            if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
-                    && adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+            if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
                     && StringUtils.isBlank(pgOrderBase.getWorkerNumber())) {
 
                 throw new RemoteServiceException("没有S编号师傅, 无法派单");

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1170,10 +1170,12 @@ public class OrderBaseLogic {
                 throw new RemoteServiceException("请选择主要工程师");
             }
 
-            if ("安装, 拆移机".contains(orderSmallType.getOrderSmallTypeText())
+            if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && "安装, 拆移机".contains(orderSmallType.getOrderSmallTypeText())
                     && StringUtils.isBlank(masterWorker.getWorkerNumber())) {
                 throw new RemoteServiceException("工单类型必须是有S编号的主要工程师");
             }
+
             pgOrderBase.setWorkerId(masterWorker.getWorkerId());
             pgOrderBase.setWorkerNumber(masterWorker.getWorkerNumber());
             pgOrderBase.setWorkerName(masterWorker.getWorkerName());