Merge branch 'master' of https://github.com/java110/MicroCommunity

service-api/src/main/java/com/java110/api/listener/auditOrder/ListAuditComplaintsListener.java

@@ -75,6 +75,7 @@ public class ListAuditComplaintsListener extends AbstractServiceApiListener {
         auditUser.setCommunityId(reqJson.getString("communityId"));
         auditUser.setPage(reqJson.getInteger("page"));
         auditUser.setRow(reqJson.getInteger("row"));
+        
 
         long count = complaintUserInnerServiceSMOImpl.getUserTaskCount(auditUser);
 

service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -315,8 +315,10 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         String userIds = "";
         String userNames = "";
         String userTels = "";
+        String taskIds = "";
         for (Task task : tasks) {
             String userId = task.getAssignee();
+            taskIds += (task.getId() + "/");
             List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
             if (users == null || users.size() == 0) {
                 continue;
@@ -325,12 +327,14 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
             userNames += (users.get(0).getName() + "/");
             userTels += (users.get(0).getTel() + "/");
         }
-        userIds = userIds.endsWith("/") ? userIds.substring(0, userIds.length() - 2) : userIds;
-        userNames = userNames.endsWith("/") ? userNames.substring(0, userNames.length() - 2) : userNames;
-        userTels = userTels.endsWith("/") ? userTels.substring(0, userTels.length() - 2) : userTels;
+        userIds = userIds.endsWith("/") ? userIds.substring(0, userIds.length() - 1) : userIds;
+        userNames = userNames.endsWith("/") ? userNames.substring(0, userNames.length() - 1) : userNames;
+        userTels = userTels.endsWith("/") ? userTels.substring(0, userTels.length() - 1) : userTels;
+        taskIds = taskIds.endsWith("/") ? taskIds.substring(0, taskIds.length() - 1) : taskIds;
         complaintDto.setCurrentUserId(userIds);
         complaintDto.setCurrentUserName(userNames);
         complaintDto.setCurrentUserTel(userTels);
+        complaintDto.setTaskId(taskIds);
         return complaintDto;
 
     }

service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java

@@ -559,7 +559,7 @@ public class WorkflowInnerServiceSMOImpl extends BaseServiceSMO implements IWork
                     msg += (comment.getFullMessage() + "/");
                 }
             }
-            msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 2) : msg;
+            msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 1) : msg;
             tmpWorkflowAuditInfoDto.setUserId(activityInstance.getAssignee());
             tmpWorkflowAuditInfoDto.setMessage(msg);
             workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);

service-store/src/main/java/com/java110/store/listener/complaint/SaveComplaintInfoListener.java

@@ -25,7 +25,6 @@ import java.util.Map;
  * Created by wuxw on 2018/5/18.
  */
 @Java110Listener("saveComplaintInfoListener")
-@Transactional
 public class SaveComplaintInfoListener extends AbstractComplaintBusinessServiceDataFlowListener {
 
     private static Logger logger = LoggerFactory.getLogger(SaveComplaintInfoListener.class);