修改包机组

whyclxw

2025-04-16 f6f81ebedac06cfb69c85d53b86d887bd5349dc8

修改包机组

 src/main/java/com/whyc/service/BaojigroupService.java

@@ -113,7 +113,9 @@
        //查询包机组已添加的用户信息
        List<UserInf> relatedUserInfList = bjUsrmapper.getUserList(id);
        //查询包机组未添加的用户信息
        List<UserInf> allUserInfList = userInfMapper.selectList((Wrapper<UserInf>) ActionUtil.objeNull);
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.select("uid", "uname");
        List<UserInf> allUserInfList = userInfMapper.selectList(wrapper);
        List<UserInf> notRelatedUserInfList = allUserInfList.stream().filter(userInf -> !relatedUserInfList.contains(userInf)).collect(Collectors.toList());

        resultMap.put("usersAdded",relatedUserInfList);

 src/main/resources/mapper/BaojigroupLockMapper.xml

@@ -39,10 +39,10 @@
          and tb_baojigroup_lock.station_id=#{stationId}
    </select>
    <select id="getLockList" resultType="com.whyc.pojo.plus_inf.LockInf">
        select distinct l.lock_id,l.lock_name,l.station_name
        from plus_user.tb_baojigroup_lock bl ,plus_inf.tb_lock_inf l
        where bl.lock_id = l.lock_id
        select distinct l.lock_id,l.lock_name,s.station_name
        from plus_user.tb_baojigroup_lock bl ,plus_inf.tb_lock_inf l,plus_inf.tb_station_inf s
        where bl.lock_id = l.lock_id and bl.station_id = s.station_id
        and bl.baoji_id = #{id}
        order by l.station_name
        order by s.station_name
    </select>
</mapper>

 src/main/resources/mapper/BaojigroupUsrMapper.xml

@@ -14,7 +14,7 @@
        and   baoji_id = #{id}
    </select>
    <select id="getUserList" resultType="com.whyc.pojo.plus_user.UserInf">
        select u.* from plus_user.tb_baojigroup_usr bu,plus_user.tb_user_inf u
        select u.uid,u.uname from plus_user.tb_baojigroup_usr bu,plus_user.tb_user_inf u
        where bu.uid = u.uid
          and bu.baoji_id = #{id}
    </select>