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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java

@@ -174,6 +174,8 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                         if ("2".equals(newoperate)) {
                             // 正式formtable_main_2714,测试formtable_main_2252，formtable_main_2401
                             boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
+                            logger_c29b3679.error( "ret--" + ret.toString()) ;
+                            logger_c29b3679.error("sql　＝　" +"update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
                             logger_c29b3679.error("billingno　＝　" +billingno);
                         }
                     }

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NewBuKaAction.java

@@ -57,7 +57,8 @@ public class NewBuKaAction extends BaseBean implements Action, EsbServerlessRpcR
                 String creater = request.getCreatorid();
                 logger_eae3b780.error(String.valueOf("creater:" + creater));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                String createsqlString = "select id  from  eteams.dbo.employee as  hrmresource where lastname ='" + creater + "'";
+//                String createsqlString = "select id  from  eteams.dbo.employee as  hrmresource where lastname ='" + creater + "'";
+                String createsqlString = "select id  from  eteams.dbo.employee as  hrmresource where id ='" + creater + "'";
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 boolean b = rs.executeSql(createsqlString, poolname);