岗位巡查清单数据去重

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskPostController.java

@@ -107,7 +107,7 @@ public class CurrentRiskPostController extends BaseController
                 Long finalCurrentRiskPostId = currentRiskPostId;
                 list.forEach(vo ->{
                     //0 一岗一人 1 一岗多人
-                    if("1".equals(currentRiskPost.getType()) && Long.parseLong(userId) != vo.getUserId()){
+                    if("1".equals(currentRiskPost.getPatrolType()) && Long.parseLong(userId) != vo.getUserId()){
                         return;
                     }
                     CurrentRiskPostList currentRiskPostList = new CurrentRiskPostList();

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/CurrentRiskPost.java

@@ -37,7 +37,7 @@ public class CurrentRiskPost extends BaseEntityClean
     private String riskPostName;
 
     /** 巡查类型 */
-    @Excel(name = "巡查类型")
+    @Excel(name = "巡查类型 0 一岗一人 1 一岗多人")
     private String patrolType;
 
     /** 岗位描述 */
@@ -57,8 +57,5 @@ public class CurrentRiskPost extends BaseEntityClean
 
     private String nickName;
 
-    @ApiModelProperty("0 一岗一人 1 一岗多人")
-    private String type;
-
     private List<CurrentRiskPostListSaveVO> list;
 }

censoft-rongtong/src/main/resources/mapper/system/CurrentRiskPostListMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patrolType != null  and patrolType != ''"> and a.patrol_type = #{patrolType}</if>
             <if test="sortNum != null "> and a.sort_num = #{sortNum}</if>
         </where>
+        GROUP BY a.current_risk_id
     </select>
     
     <select id="selectCurrentRiskPostListById" parameterType="Long" resultMap="CurrentRiskPostListResult">