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

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

@@ -138,7 +138,7 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer
                 } else if (name.equals("QJLB2")) {
                     String poolname = "";
                     // TODO E10必须指定poolname数据源
-                    boolean b = rdsd.executeSql("select classcode from e10_common.dbo.ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr");
+                    boolean b = rdsd.executeSql("select classcode from ht_ATDATTENDANCECLASS where ID='" + value + "'", "hr");
                     logger_13aa9db7.error("b == " + b);
                     rdsd.next();
                     QJLB = Util.null2String(rdsd.getString("classcode"));
@@ -252,7 +252,7 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer
             return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
         } catch (Exception e) {
             e.printStackTrace();
-            logger_13aa9db7.error("QingJiaShenQingAction e: {}", e.getMessage());
+            logger_13aa9db7.error("QingJiaShenQingAction e: {}", e);
             return  WeaResult.fail(500, "QingJiaShenQingAction e: {}"+ e, getResultMapForAction(weaverResultMap, "result",e.getMessage(), request.getRequestManager()));
         }
     }