Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java

@@ -122,6 +122,7 @@ public class ActTaskController {
     public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params) {
         String userId = SecurityUser.getUserId().toString();
         params.put("userId", userId);
+        logger.info("--------------------------------------------------------{}",userId);
         PageData<TaskDTO> page = actTaskService.page(params);
         for (TaskDTO taskDTO : page.getList()) {
             if (!StringUtils.isEmpty(taskDTO.getAssignee())) {

renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java

@@ -145,8 +145,10 @@ public class ActTaskService extends BaseServiceImpl {
         // 同一审核组内成员
         List<String> groupUserId = new ArrayList<>();
         List<SysAuditTeamDTO> sysAuditTeamDTOS = new ArrayList<>();
+        logger.info("auditteam:" + auditteam);
         if (auditteam) {
             sysAuditTeamDTOS = sysAuditTeamService.selectByMemberOne(Long.parseLong(userId));
+            logger.info("审核组成员：" + sysAuditTeamDTOS.toString());
             groupUserId = sysAuditTeamDTOS
                     .stream()
                     .map(index -> index.getMember())