Merge remote-tracking branch 'origin/master'

# Conflicts:
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dto/SysUserDto.java

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/ProjectTeamController.java

@@ -180,7 +180,8 @@ public class ProjectTeamController {
     @RequestMapping("/findPrincipal")
     public ResMsg findPrincipal() {
 
-        return projectTeamApi.findPrincipal();
+        ResMsg principal = projectTeamApi.findPrincipal();
+        return principal;
     }
 
     /**

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ProjectTeamServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectTeamInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.RelevanceProjectInfoEntity;
@@ -11,6 +12,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.mapper.RelevanceProjectInfoMapper
 import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.ProjectTeamService;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
+import com.ankaibei.workFlow.webadmin.ankaibei.vo.WorkSysUserVo;
 import com.ankaibei.workFlow.webadmin.upms.controller.SysUserController;
 import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
@@ -156,7 +158,8 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
     @Override
     public ResMsg findPrincipal() {
         List<Map<String, String>> byUserDutyEquals = userInfoMapper.getProUserAll();
-        return new ResMsg(CodeEnum.OK, byUserDutyEquals);
+        List<WorkSysUserVo> workSysUserVoList = JSON.parseArray(JSON.toJSONString(byUserDutyEquals), WorkSysUserVo.class);
+        return new ResMsg(CodeEnum.OK, workSysUserVoList);
     }
 
     @Override

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/TaskInfoServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -75,6 +76,7 @@ public class TaskInfoServiceImpl implements TaskInfoService {
     }
 
     @Override
+    @Transactional
     public ResMsg addTaskInfo(TaskInfoEntity taskInfoEntity, List<Long> taskParticipant) {
         if (taskInfoMapper.countByTargetTaskEqualsAndIsDeleteEquals(taskInfoEntity.getTargetTask(), "1") > 1) {
             return new ResMsg(CodeEnum.TASK_ALREADY_EXISTS);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/WorkSysUserVo.java

@@ -0,0 +1,15 @@
+package com.ankaibei.workFlow.webadmin.ankaibei.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class WorkSysUserVo implements Serializable {
+
+    private String userId;
+    private String userName;
+}

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dto/SysUserDto.java

@@ -7,6 +7,7 @@ import com.ankaibei.workFlow.common.core.validator.ConstDictRef;
 import com.ankaibei.workFlow.webadmin.upms.model.constant.SysUserType;
 import com.ankaibei.workFlow.webadmin.upms.model.constant.SysUserStatus;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -136,6 +137,7 @@ public class SysUserDto extends MyPageParam {
     @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
     private String createTimeEnd;
 
+    @TableField(exist = false)
     @ApiModelProperty(value = "逗号分隔的部门岗位Id列表")
     private String deptPostIdListString;
 }