撤回分配服务申请单逻辑修改

src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -893,7 +893,7 @@ public class serviceorder extends Controller {
         Rows serviceorderRows = dbConnect.runSqlQuery("select status,billno from sa_serviceorder where sa_serviceorderid ='"
                 + sa_serviceorderid + "' and  siteid='" + siteid + "'");
         if(serviceorderRows.isNotEmpty()){
-            if(!serviceorderRows.get(0).getString("status").equals("待受理") || !serviceorderRows.get(0).getString("status").equals("待服务")  || !serviceorderRows.get(0).getString("status").equals("服务中") ){
+            if(!(serviceorderRows.get(0).getString("status").equals("待受理") || serviceorderRows.get(0).getString("status").equals("待服务")  || serviceorderRows.get(0).getString("status").equals("服务中"))){
                 return getErrReturnObject().setErrMsg("非待受理/待服务/服务中状态的服务申请单无法撤回分配").toString();
             }
             sqllist.add("update sa_serviceorder set sys_enterpriseid_service=0,status='待分配',allocationdate=null,allocationby='' where sa_serviceorderid="+sa_serviceorderid);