Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java

@@ -22,6 +22,6 @@ public class FeignTokenConfig implements RequestInterceptor {
         JSONObject jsonObject = JSONUtil.parseObj(json);
 
         //添加token
-        template.header("Authorization", jsonObject.get("token").toString());
+        template.header("Authorization", jsonObject.getStr("token"));
     }
 }

mt/src/main/java/com/ccsens/mt/api/DebugController.java

@@ -6,6 +6,7 @@ import com.ccsens.mt.bean.po.LevelUser;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.CompetePlayerDao;
+import com.ccsens.mt.service.IExcelService;
 import com.ccsens.mt.service.ILevelUpService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.RedisUtil;
@@ -35,13 +36,16 @@ public class DebugController {
     private ILevelUpService levelUpService;
     @Resource
     private CompetePlayerDao competePlayerDao;
+    @Resource
+    private IExcelService excelService;
 
     @ApiOperation(value = "/测试",notes = "")
     @ApiImplicitParams({
     })
     @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
     public JsonResponse debug(HttpServletRequest request) throws Exception {
-        return JsonResponse.newInstance().ok("测试");
+        List<TableVo.CompeteAllCount1> competeAllCount1s = excelService.competeAllCountList1(0);
+        return JsonResponse.newInstance().ok(competeAllCount1s);
     }
 
     @ApiOperation(value = "/测试自动晋级",notes = "")

mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.json.JSONObject;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,9 +40,9 @@ public class KCPlayerController {
 
     @ApiOperation(value = "云点播回调接口", notes = "上传时候后，云点播回调接口，保存视频的路径")
     @RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse receive(@RequestBody Map map) {
-        log.info("接受文件上传通知：{}",map);
-        kcPlayerService.saveVideoUrl(map);
+    public JsonResponse receive(@RequestBody JSONObject jsonObject) {
+        log.info("接受文件上传通知：{}",jsonObject);
+        kcPlayerService.saveVideoUrl(jsonObject);
         return JsonResponse.newInstance().ok();
     }
 

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -292,7 +292,6 @@ public class ProvinceCompeteDto {
         private int judgmentNum;
         @ApiModelProperty("姓名")
         private String judgmentName;
-        @NotEmpty
         @ApiModelProperty("手机号")
         private String judgmentPhone;
         @ApiModelProperty("备注")

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -492,10 +492,10 @@ public class CompeteVo {
         public BigDecimal referee0 = new BigDecimal(0);
         @ApiModelProperty("最后得分")
         public BigDecimal result = new BigDecimal(0);
-//        @ApiModelProperty("排名")
-//        public int rownum;
         @ApiModelProperty("排名")
-        public int order;
+        public int rownum;
+//        @ApiModelProperty("排名")
+//        public int order;
         @ApiModelProperty("备注")
         public Byte remark;
     }

mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java

@@ -1,6 +1,7 @@
 package com.ccsens.mt.bean.vo;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -113,6 +114,50 @@ public class TableVo {
         @ApiModelProperty("参赛人数 顺序：小学(女男混)→中学(女男混)→高职院校(女男混)→本科院校(女男混)→俱乐部(女男混)")
         private List<Integer> nums = new ArrayList<>();
     }
+    @Data
+    @ApiModel("XXX比赛报名汇总表")
+    public static class CompeteAllCount1{
+        @ApiModelProperty("参赛id")
+        private String projectId;
+        @ApiModelProperty("参赛项目")
+        private String projectName;
+        @ApiModelProperty("通级 0限制 1不限制")
+        private int certificate;
+        @ApiModelProperty("是否限制组别 0否 1是")
+        private int joinRile;
+        @ApiModelProperty("参赛人数 顺序：小学(男女混)→中学(男女混)→高职院校(男女混)→本科院校(男女混)→俱乐部(男女混)")
+        private List<String> nums;
+        @ApiModelProperty("每个组别内的人数")
+        private List<JoinGroupNum> joinNum;
+
+        public List<String> getNums(){
+            List<String> nums = new ArrayList<>();
+            if(CollectionUtil.isNotEmpty(joinNum)){
+                if(certificate == 0){
+                    joinNum.forEach(joinGroupNum -> {
+                        nums.add(joinGroupNum.getNum());
+                    });
+                }else {
+                    int i = 0;
+                    for(JoinGroupNum joinGroupNum : joinNum){
+                        if(!"/".equalsIgnoreCase(joinGroupNum.getNum())){
+                            i += Integer.parseInt(joinGroupNum.getNum());
+                        }
+                    }
+                    nums.add(String.valueOf(i));
+                }
+            }
+            return nums;
+        }
+    }
+    @Data
+    @ApiModel("XXX比赛报名汇总表")
+    public static class JoinGroupNum{
+        @ApiModelProperty("组别id")
+        private Long groupId;
+        @ApiModelProperty("人数")
+        private String num;
+    }
 
     @Data
     @ApiModel("日程安排")

mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java

@@ -86,4 +86,17 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
      * @return
      */
     int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard,@Param("playerId")Long playerId);
+
+    /**
+     * 查找参赛人员汇总（个人赛）
+     * @param type
+     */
+    List<TableVo.CompeteAllCount1> getJoinNumByType(@Param("type")Byte type);
+
+    /**
+     * 查看参赛团队汇总（团队）
+     * @param type
+     * @return
+     */
+    List<TableVo.CompeteAllCount1> getJoinTeamNumByType(@Param("type")byte type);
 }

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -204,7 +204,7 @@ public class CompeteService implements ICompeteService {
 
         for (int i=0; i<totalScoreDisplaysList.size();i++){
             CompeteVo.TotalScoreDisplay totalScoreDisplay = totalScoreDisplaysList.get(i);
-            totalScoreDisplay.setOrder(i+1);
+            totalScoreDisplay.setRownum(i+1);
         }
 
         return new PageInfo<>(totalScoreDisplaysList);

mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@@ -3,6 +3,7 @@ package com.ccsens.mt.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto;
 import com.ccsens.cloudutil.bean.tall.dto.TallTaskDto;
 import com.ccsens.cloudutil.bean.tall.vo.MemberVo;
@@ -475,7 +476,9 @@ public class CompeteTaskService implements ICompeteTaskService {
                         allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> {
                             if (ObjectUtil.isNotNull(siteJudgment)) {
                                 siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> {
+                                    if(StrUtil.isNotEmpty(judgmentInfo.getJudgmentPhone())) {
                                         saveJudgmentAndTask(param.getCompeteTimeId(), param.getTallProjectId(), project, siteJudgment, judgmentInfo, token);
+                                    }
                                 });
                             }
                         });
@@ -513,17 +516,6 @@ public class CompeteTaskService implements ICompeteTaskService {
             //修改成员
             //修改任务
         } else {
-            competeJudgment = new CompeteJudgment();
-            competeJudgment.setId(snowflake.nextId());
-            competeJudgment.setName(judgmentInfo.getJudgmentName());
-            competeJudgment.setPhone(judgmentInfo.getJudgmentPhone());
-            competeJudgment.setRemark(judgmentInfo.getRemark());
-            competeJudgment.setCompeteTimeId(competeTimeId);
-            competeJudgment.setProjectId(project.getId());
-            competeJudgment.setSite(siteJudgment.getSite());
-            competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
-            competeJudgmentDao.insertSelective(competeJudgment);
-
             //添加角色
             MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
             saveRole.setProjectId(tallProjectId);
@@ -539,12 +531,14 @@ public class CompeteTaskService implements ICompeteTaskService {
             log.info("在tall内添加角色：{}", saveRole);
             JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
             log.info("添加角色后返回：{}", roleJsonResponse);
-            if (ObjectUtil.isNotNull(roleJsonResponse)) {
+            //失败return
+            if (ObjectUtil.isNull(roleJsonResponse) || roleJsonResponse.getCode() != 200) {
+                return;
+            }
             MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
             if (ObjectUtil.isNotNull(roleInfo)) {
                 roleId = roleInfo.getRoleId();
             }
-            }
             //添加成员
             MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember();
             saveMember.setMemberName(judgmentInfo.getJudgmentName());
@@ -557,7 +551,18 @@ public class CompeteTaskService implements ICompeteTaskService {
             log.info("添加成员后返回：{}", memberJsonResponse);
             //如果成员已存在，查询成员信息然后添加至角色内
             Long memberId = null;
-            if (ObjectUtil.isNotNull(memberJsonResponse)) {
+            Long userId = null;
+            //失败return
+            if (ObjectUtil.isNull(memberJsonResponse)) {
+                return;
+            }
+            if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){
+                return;
+            }
+            if(roleJsonResponse.getCode() == 200){
+                MemberVo.Member member = memberJsonResponse.getData();
+                userId = member.getUserId();
+            }
             //code等于21代表成员已存在
             if (memberJsonResponse.getCode() == 21) {
                 //查询该手机号在项目内的成员的id
@@ -578,10 +583,13 @@ public class CompeteTaskService implements ICompeteTaskService {
                     saveMemberInRole.setRoleId(roleId);
                     saveMemberInRole.setMemberId(memberId);
                     saveMemberInRole.setToken(token);
-                        tallFeignClient.saveMemberInRole(saveMemberInRole);
+                    JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole);
+                    if (ObjectUtil.isNull(jsonResponse) || jsonResponse.getCode() != 200) {
+                        return;
                     }
                 }
             }
+
             //添加任务
             //查找场次信息表
             CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
@@ -602,6 +610,9 @@ public class CompeteTaskService implements ICompeteTaskService {
                     log.info("在tall内添加任务：{}", addTask);
                     JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
                     log.info("添加任务后返回：{}", normalTaskJsonResponse);
+                    if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
+                        return;
+                    }
                     if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
                         TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
                         if (ObjectUtil.isNotNull(normalTask)) {
@@ -613,13 +624,28 @@ public class CompeteTaskService implements ICompeteTaskService {
                             log.info("修改tall内任务插件配置：{}", updatePluginConfig);
                             JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
                             log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
+                            if (ObjectUtil.isNull(pluginVoJsonResponse) || pluginVoJsonResponse.getCode() != 200) {
+                                return;
+                            }
                         }
                     }
                 }
             }
+            //添加裁判
+            competeJudgment = new CompeteJudgment();
+            competeJudgment.setId(snowflake.nextId());
+            competeJudgment.setName(judgmentInfo.getJudgmentName());
+            competeJudgment.setPhone(judgmentInfo.getJudgmentPhone());
+            competeJudgment.setRemark(judgmentInfo.getRemark());
+            competeJudgment.setCompeteTimeId(competeTimeId);
+            competeJudgment.setProjectId(project.getId());
+            competeJudgment.setSite(siteJudgment.getSite());
+            competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
             competeJudgment.setRoleId(roleId);
             competeJudgment.setMemberId(memberId);
-            competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment);
+            competeJudgment.setUserId(userId);
+            competeJudgmentDao.insertSelective(competeJudgment);
+
         }
     }
 

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -892,9 +892,29 @@ public class ExcelService implements IExcelService {
 
 
     private List<TableVo.CompeteAllCount> competeAllCountList(CompeteDto.CompeteTime params){
+        //查询个人赛的数量统计
+
+        //查询限制组别的团体赛的统计
+        //查询不限组别团体赛的统计
         return competePlayerDao.getTeamJoinNumByType(params.getCompeteTimeId());
     }
 
+    @Override
+    public List<TableVo.CompeteAllCount1> competeAllCountList1(int type){
+//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getCompeteTimeId());
+        List<TableVo.CompeteAllCount1> competeAllCountList = new ArrayList<>();
+//        if(ObjectUtil.isNotNull(competeTime)) {
+            //查询个人赛的数量统计
+            competeAllCountList = competePlayerDao.getJoinNumByType((byte) type);
+            //查询团体赛的数量统计
+//        List<TableVo.CompeteAllCount1> groupNum = competePlayerDao.getJoinTeamNumByType((byte) type);
+
+
+            //查询限制组别的团体赛的统计
+            //查询不限组别团体赛的统计
+//        }
+        return competeAllCountList;
+    }
 
 
     private String getExcelFilePathForCompeteAllCount(List<TableVo.CompeteAllCount> arrayList) throws IOException {
@@ -1377,7 +1397,7 @@ public class ExcelService implements IExcelService {
                 PoiUtil.PoiUtilCell threeEle=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getAvg4To6()),1,1);
                 PoiUtil.PoiUtilCell threeTwe=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee0()),1,1);
                 PoiUtil.PoiUtilCell threeThir=new PoiUtil.PoiUtilCell((StringUtil.valueOf(mes.getResult())),1,1);
-                PoiUtil.PoiUtilCell threeFour=new PoiUtil.PoiUtilCell((StringUtil.valueOf(mes.getOrder())),1,1);
+                PoiUtil.PoiUtilCell threeFour=new PoiUtil.PoiUtilCell((StringUtil.valueOf(mes.getRownum())),1,1);
                 three.add(threeThree);
                 three.add(threeFive);
                 three.add(threeSix);

mt/src/main/java/com/ccsens/mt/service/IExcelService.java

@@ -94,6 +94,7 @@ public interface IExcelService {
 
 //    String patternExpTable(ScoreDto.ShowResult param);
 
+    List<TableVo.CompeteAllCount1> competeAllCountList1(int type);
     /**
      * 生成比赛前八名的表格
      * @param params 第几届比赛

mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java

@@ -1,6 +1,6 @@
 package com.ccsens.mt.service;
 
-import java.util.Map;
+import org.json.JSONObject;
 
 public interface IKCPlayerService {
     /**
@@ -14,5 +14,5 @@ public interface IKCPlayerService {
      * 云点播回调接口
      * @param map
      */
-    void saveVideoUrl(Map map);
+    void saveVideoUrl(JSONObject map);
 }

mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java

@@ -13,12 +13,12 @@ import com.ccsens.util.KCPlayerSignature;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Map;
 import java.util.Random;
 @Slf4j
 @Service
@@ -66,11 +66,16 @@ public class KCPlayerService implements IKCPlayerService{
     }
 
     @Override
-    public void saveVideoUrl(Map map) {
+    public void saveVideoUrl(JSONObject jsonObject) {
+        JSONObject fileUploadEvent = jsonObject.getJSONObject("FileUploadEvent");
+        JSONObject mediaBasicInfo = fileUploadEvent.getJSONObject("MediaBasicInfo");
         // TODO 获取回传的id（场次id）
-        Long orderId = null;
+        JSONObject sourceInfo = mediaBasicInfo.getJSONObject("SourceInfo");
+        JSONObject sourceContext = sourceInfo.getJSONObject("SourceContext");
+        Long orderId = Long.parseLong(sourceContext.toString());
         // TODO 获取视频路径
-        String videoUrl = "";
+        JSONObject mediaUrl = mediaBasicInfo.getJSONObject("MediaUrl");
+        String videoUrl = mediaUrl.toString();
         //通过场次id获取场次信息
         CompeteStartOrder startOrder = startOrderMapper.selectByPrimaryKey(orderId);
         if(ObjectUtil.isNull(startOrder)){

mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@@ -39,6 +39,16 @@
             <result column="playerName" property="playerNames"/>
         </collection>
     </resultMap>
+
+    <resultMap id="teamNum1" type="com.ccsens.mt.bean.vo.TableVo$CompeteAllCount1">
+        <id column="projectId" property="projectId"/>
+        <result column="projectName" property="projectName"/>
+        <result column="certificate" property="certificate"/>
+        <collection property="joinNum" ofType="com.ccsens.mt.bean.vo.TableVo$JoinGroupNum">
+            <id column="groupId" property="groupId"/>
+            <result column="aNum" property="num"/>
+        </collection>
+    </resultMap>
     <select id="getInfo" resultType="com.ccsens.mt.bean.vo.CompeteVo$GetPlayerInfo">
           SELECT
             p.id AS playerId,
@@ -316,4 +326,59 @@
         and p.rec_status = 0
         and c.rec_status = 0
     </select>
+    <select id="getJoinNumByType" resultMap="teamNum1">
+        SELECT
+        p.id as projectId,
+        p.`name` as projectName,
+        p.certificate as certificate,
+        a.groupId as groupId,
+        a.aNum as aNum
+        FROM
+        t_compete_project p
+        LEFT JOIN(
+            SELECT
+            g.id as groupId,
+            g.group_name as groupName,
+            g.sequence as sequence,
+            t.projectId,
+            if(t.num is null,'/',t.num) as aNum
+            FROM
+            t_compete_group g
+            LEFT JOIN
+            (
+                SELECT
+                g.id as gid,
+                g.group_name,
+                count(pp.id) as num,
+                pp.project_id as projectId
+                FROM
+                t_compete_group g
+                LEFT JOIN t_compete_player p on p.compete_group_id = g.id
+                LEFT JOIN t_compete_project_player pp on pp.player_id = p.id
+                LEFT JOIN t_compete_company c on p.company_id = c.id
+                WHERE
+                g.type = 0
+                and g.rec_status = 0
+                and pp.rec_status = 0
+                and p.rec_status = 0
+                and p.rec_status = 0
+                and c.rec_status = 0
+                GROUP BY g.id,pp.project_id
+                ORDER BY g.sequence
+            )t
+            on (t.gid = g.id or t.gid is null)
+            WHERE
+            g.type = 0
+            and g.rec_status = 0
+        )a on (p.id = a.projectId or a.projectId is null)
+        WHERE
+        p.type = #{type}
+        and p.team = 0
+        and p.`level` = 2
+        and rec_status = 0
+        ORDER BY p.id,a.sequence
+    </select>
+    <select id="getJoinTeamNumByType" resultMap="teamNum1">
+
+    </select>
 </mapper>

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -291,7 +291,7 @@
       pc.end_time as endTime
       FROM
       t_compete_project p
-      LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 and rec_status is null) pc on pc.project_id = p.id
+      LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 or rec_status is null) pc on pc.project_id = p.id
       LEFT JOIN
           (
               SELECT

tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java

@@ -38,6 +38,8 @@ public class ProShow implements Serializable {
 
     private Byte recStatus;
 
+    private Byte roleBelong;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -176,6 +178,14 @@ public class ProShow implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public Byte getRoleBelong() {
+        return roleBelong;
+    }
+
+    public void setRoleBelong(Byte roleBelong) {
+        this.roleBelong = roleBelong;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -199,6 +209,7 @@ public class ProShow implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", roleBelong=").append(roleBelong);
         sb.append("]");
         return sb.toString();
     }

tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java

@@ -1154,6 +1154,66 @@ public class ProShowExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andRoleBelongIsNull() {
+            addCriterion("role_belong is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongIsNotNull() {
+            addCriterion("role_belong is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongEqualTo(Byte value) {
+            addCriterion("role_belong =", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongNotEqualTo(Byte value) {
+            addCriterion("role_belong <>", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongGreaterThan(Byte value) {
+            addCriterion("role_belong >", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongGreaterThanOrEqualTo(Byte value) {
+            addCriterion("role_belong >=", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongLessThan(Byte value) {
+            addCriterion("role_belong <", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongLessThanOrEqualTo(Byte value) {
+            addCriterion("role_belong <=", value, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongIn(List<Byte> values) {
+            addCriterion("role_belong in", values, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongNotIn(List<Byte> values) {
+            addCriterion("role_belong not in", values, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongBetween(Byte value1, Byte value2) {
+            addCriterion("role_belong between", value1, value2, "roleBelong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleBelongNotBetween(Byte value1, Byte value2) {
+            addCriterion("role_belong not between", value1, value2, "roleBelong");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -57,6 +57,8 @@ public class ProRoleService implements IProRoleService {
     private TaskDetailDao taskDetailDao;
     @Resource
     private ProUserAttentionRoleMapper userAttentionRoleMapper;
+    @Resource
+    private ProShowDao proShowDao;
 
     @Override
     public void saveProRole(ProRole proRole) {
@@ -100,6 +102,7 @@ public class ProRoleService implements IProRoleService {
                         continue;
                     }
                     for (ProRole role : roleList) {
+
                         if (memberRole.getId().equals(role.getId())) {
                             memberRole.setMine(true);
                             memberRole.setIsShow(true);
@@ -109,7 +112,6 @@ public class ProRoleService implements IProRoleService {
                             break;
                         } else {
                             memberRole.setMine(false);
-                            //查找当前用户是否关注此角色
                             ProUserAttentionRoleExample userAttentionRoleExample = new ProUserAttentionRoleExample();
                             userAttentionRoleExample.createCriteria().andProjectIdEqualTo(projectId)
                                     .andUserIdEqualTo(currentUserId).andRoleIdEqualTo(memberRole.getId());
@@ -120,6 +122,26 @@ public class ProRoleService implements IProRoleService {
                             }
                         }
                     }
+
+                }
+
+
+                //查看项目配置信息
+                ProShowExample proShowExample = new ProShowExample();
+                proShowExample.createCriteria().andProjectIdEqualTo(projectId);
+                List<ProShow> showList = proShowDao.selectByExample(proShowExample);
+                if(CollectionUtil.isNotEmpty(showList)){
+                    ProShow show = showList.get(0);
+                    //是否可以看见不属于自己的角色
+                    if(ObjectUtil.isNotNull(show) && show.getRoleBelong() == 0){
+                        for(int i =0 ; i<memberRoleList.size() ; i++){
+                            ProjectVo.RoleInfo memberRole = memberRoleList.get(i);
+                            if(!memberRole.isMine()){
+                                memberRoleList.remove(i);
+                                i--;
+                            }
+                        }
+                    }
                 }
                 //排除该角色不能看的其他角色
                 List<Long> excludeIdList = new ArrayList<>();
@@ -207,6 +229,11 @@ public class ProRoleService implements IProRoleService {
         //查询二级角色
         List<ProjectVo.RoleInfo> memberRoleList;
         memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId);
+        //查询项目配置，
+        if(CollectionUtil.isEmpty(memberRoleList)){
+            return memberRoleList;
+        }
+
         return memberRoleList;
     }
 

tall/src/main/resources/mapper_raw/ProShowMapper.xml

@@ -19,6 +19,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="role_belong" jdbcType="TINYINT" property="roleBelong" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -81,7 +82,7 @@
   <sql id="Base_Column_List">
     id, project_id, slide, filter, is_show_mvp, create_task, time_show, duration, show_shortcuts, 
     select_task_type, detail_path, pims_nav_type, share_change, share_change_code, created_at, 
-    updated_at, rec_status
+    updated_at, rec_status, role_belong
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap">
     select
@@ -119,13 +120,15 @@
       time_show, duration, show_shortcuts, 
       select_task_type, detail_path, pims_nav_type, 
       share_change, share_change_code, created_at, 
-      updated_at, rec_status)
+      updated_at, rec_status, role_belong
+      )
     values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT}, 
       #{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, 
       #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT}, 
       #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT}, 
       #{shareChange,jdbcType=TINYINT}, #{shareChangeCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{roleBelong,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow">
     insert into t_pro_show
@@ -181,6 +184,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="roleBelong != null">
+        role_belong,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -234,6 +240,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="roleBelong != null">
+        #{roleBelong,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultType="java.lang.Long">
@@ -296,6 +305,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.roleBelong != null">
+        role_belong = #{record.roleBelong,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -319,7 +331,8 @@
       share_change_code = #{record.shareChangeCode,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      role_belong = #{record.roleBelong,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -375,6 +388,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="roleBelong != null">
+        role_belong = #{roleBelong,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -395,7 +411,8 @@
       share_change_code = #{shareChangeCode,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      role_belong = #{roleBelong,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>