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

src/weaver/interfaces/hostar/action/OutSignSyncAction.java

@@ -11,14 +11,18 @@ import weaver.interfaces.workflow.action.Action;
 import weaver.soa.workflow.request.Property;
 import weaver.soa.workflow.request.RequestInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class OutSignSyncAction implements Action {
 
     BaseBean bb = new BaseBean();
+
     @Override
     public String execute(RequestInfo requestInfo) {
-
+        bb.writeLog("OutSignSyncAction-start");
         String startDate = "";
         String endDate = "";
         String resourceid = "";
@@ -49,7 +53,7 @@ public class OutSignSyncAction implements Action {
             if (StringUtils.isNotBlank(sjjsrq)) {
                 endDate = sjjsrq;
             }
-
+            bb.writeLog("start to handle data.");
             if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate) && StringUtils.isNotBlank(resourceid)) {
                 // 内部同行人也要考虑
                 if (StringUtils.isNotBlank(nbtxr)) {
@@ -67,9 +71,9 @@ public class OutSignSyncAction implements Action {
                     String signinfo = Util.null2String(rs.getString("signinfo"));
                     infos.add(signinfo);
                 }
-
+                bb.writeLog("infos is:" + infos);
                 for (String inf : infos) {
-                    if (inf != null ) {
+                    if (StringUtils.isNotEmpty(inf)) {
                         Map<String, Object> in = mapStringToMap(inf);
                         String userId = Util.null2String(in.get("userId"));
                         String userType = Util.null2String(in.get("userType"));
@@ -111,7 +115,7 @@ public class OutSignSyncAction implements Action {
                 }
             }
         } catch (Exception e) {
-            bb.writeLog("OutSignSyncAction Exception: " + e);
+            bb.writeLog("OutSignSyncAction Exception: " + e.getMessage());
             return Action.FAILURE_AND_CONTINUE;
         }