Merge remote-tracking branch 'origin/develop' into develop

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

@@ -810,7 +810,15 @@ public class serviceorder extends Controller {
         if (projectlearders != null && !projectlearders.isEmpty()) {
             for (Object obj : projectlearders) {
                 sqlList.addAll(DataTeam.createTeamSQL(this, "sa_workorder", sa_workorderid, (int) obj));
+                String leadername = "";
+                Rows leadernameRows = dbConnect.runSqlQuery("select name from sys_users where userid=" + obj);
+                if (leadernameRows.isNotEmpty()) {
+                    leadername = leadernameRows.get(0).getString("name");
+                }
+                sqlList.add(DataContrlLog.createLog(this, "sa_workorder", sa_workorderid, "重新指派工单", "由【" + username + "】重新指派到【" + leadername + "】").getSQL());
             }
+        } else {
+            sqlList.add(DataContrlLog.createLog(this, "sa_workorder", sa_workorderid, "重新指派工单", "由【" + username + "】重新指派到【抢单中心】").getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);
         return getSucReturnObject().toString();