整改人员查询列表修改

huaxin-system/src/main/java/com/zehong/system/domain/TRectifyGroupMemberInfo.java

@@ -40,6 +40,16 @@ public class TRectifyGroupMemberInfo extends BaseEntity
 
     private String nickName;
 
+    /**
+     * 分组类型
+     */
+    private String type;
+
+    /**
+     * 组名
+     */
+    private String groupName;
+
     public void setMemberId(Long memberId) 
     {
         this.memberId = memberId;
@@ -103,6 +113,22 @@ public class TRectifyGroupMemberInfo extends BaseEntity
         this.nickName = nickName;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

huaxin-system/src/main/java/com/zehong/system/service/impl/TRectifyGroupMemberInfoServiceImpl.java

 package com.zehong.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 import com.zehong.common.exception.CustomException;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.TRectifyGroupMemberInfoMapper;
 import com.zehong.system.domain.TRectifyGroupMemberInfo;
+import com.zehong.system.mapper.TRectifyGroupMemberInfoMapper;
 import com.zehong.system.service.ITRectifyGroupMemberInfoService;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 整改组内成员信息Service业务层处理
@@ -130,27 +128,45 @@ public class TRectifyGroupMemberInfoServiceImpl implements ITRectifyGroupMemberI
         List<TRectifyGroupMemberInfo> result = new ArrayList<>();
         for(TRectifyGroupMemberInfo memberInfo : memberInfoList){
             /**
-             * 1.组长能看到自己组的成员和其他组的组长
-             * 2.组成员只能看到自己班的班长
+             * 1.不是维修班的组员只能看到自己的组长
+             * 2.不是维修班的组长只能看到维修班的班长
+             * 3.维修班的班长只能看到自己的组员和其他维修班的班长
+             * 4.维修班的组员只能看到自己的组长
              */
 
             if("1".equals(memberInfo.getPost())){
-                //组员信息
+                //组长登录
+                if("2".equals(memberInfo.getType())){
+                    //维修班班长登录
+                    //维修班组员信息
                     TRectifyGroupMemberInfo team = new TRectifyGroupMemberInfo();
                     team.setGroupId(memberInfo.getGroupId());
                     team.setPost("2");
                     List<TRectifyGroupMemberInfo> teamInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(team);
                     result.addAll(teamInfo);
-                //判断是否存在组长信息
-                Optional<TRectifyGroupMemberInfo> isHasLeaderInfo = result.stream().filter(item -> "1".equals(item.getPost())).findAny();
-                if(isHasLeaderInfo.isPresent()){
-                    //组长信息
+                    //维修班组长信息
                     TRectifyGroupMemberInfo leader = new TRectifyGroupMemberInfo();
                     leader.setPost("1");
-                    List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(team);
+                    leader.setType("2");
+                    List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(leader);
+                    /*if(!CollectionUtils.isEmpty(leaderInfo)){
+                        //其他组的组长
+                        List<TRectifyGroupMemberInfo> otherLeaderInfo = leaderInfo.stream().filter(item -> !memberInfo.getGroupId().equals(item.getGroupId())).collect(Collectors.toList());
+                        result.addAll(otherLeaderInfo);
+                    }*/
+                    result.addAll(leaderInfo);
+                }else{
+                    //其他班班长
+                    //维修班组长信息
+                    TRectifyGroupMemberInfo leader = new TRectifyGroupMemberInfo();
+                    leader.setPost("1");
+                    leader.setType("2");
+                    List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(leader);
                     result.addAll(leaderInfo);
                 }
+
             }else{
+                //组员登录
                 //本组组长信息
                 TRectifyGroupMemberInfo team = new TRectifyGroupMemberInfo();
                 team.setGroupId(memberInfo.getGroupId());

huaxin-system/src/main/resources/mapper/system/TRectifyGroupMemberInfoMapper.xml

@@ -29,10 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             member.update_time,
             member.is_del,
             member.remarks,
-            su.nick_name as nickName
+            su.nick_name as nickName,
+            info.type,
+            info.group_name AS groupName
         FROM
             t_rectify_group_member_info member
         LEFT JOIN sys_user su ON su.user_id = member.user_id
+        LEFT JOIN t_rectify_person_group_info info ON info.group_id = member.group_id
     </sql>
 
     <select id="selectTRectifyGroupMemberInfoList" parameterType="TRectifyGroupMemberInfo" resultMap="TRectifyGroupMemberInfoResult">
@@ -43,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="post != null  and post != ''"> and member.post = #{post}</if>
             <if test="isDel != null  and isDel != ''"> and member.is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and member.remarks = #{remarks}</if>
+            <if test="type != null  and type != ''"> and info.type = #{type}</if>
         </where>
     </select>