java/HongRuiTang.git

parent: 3e0236df | 补丁 | 提交 | ignore whitespace

44323

2024-01-26 2bb5d47275effc59de3377ce53e9b9cbf07b781a

海恒bug修改

5个文件已修改

	ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -948,7 +948,11 @@
                            List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
                            // 获取店铺ids
                            List<Long> data = shopService.getShopIdsByUserIds(userIds).getData();
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }
                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -956,7 +960,12 @@
                            longs.add(sysUser.getUserId());
                            // 获取店铺ids
                            List<Long> data1 = shopService.getShopIdsByUserIds(longs).getData();
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }

                            break;
                    }
                }

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml

@@ -318,6 +318,7 @@
            <foreach collection="list" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
            AND tm.binding_flag = 1
        </if>
        ORDER BY tm.create_time DESC
    </select>

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -93,7 +93,12 @@
                                    .in("belong_user_id", userIds)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }

                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -104,7 +109,11 @@
                                    .in("belong_user_id", longs)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }
                            break;
                    }
                }
@@ -135,7 +144,12 @@
                                    .in("belong_user_id", userIds)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }

                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -146,7 +160,11 @@
                                    .in("belong_user_id", longs)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }
                            break;
                    }
                }
@@ -412,7 +430,12 @@
                                    .in("belong_user_id", userIds)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }

                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -423,7 +446,11 @@
                                    .in("belong_user_id", longs)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }
                            break;
                    }
                }
@@ -490,7 +517,11 @@
                                    .in("belong_user_id", userIds)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data);
                            if (data.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data);
                            }
                            break;
                        case "5":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -501,7 +532,11 @@
                                    .in("belong_user_id", longs)
                                    .eq("del_flag", 0))
                                    .stream().map(Shop::getShopId).collect(Collectors.toList());
                            scope.addAll(data1);
                            if (data1.size()==0){
                                scope.add(0L);
                            }else{
                                scope.addAll(data1);
                            }
                            break;
                    }
                }

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml

@@ -349,9 +349,9 @@
        <if test="param.recommendPerson!=null and param.recommendPerson!=''">
            AND ts.recommend_person = #{param.recommendPerson}
        </if>
        <if test="belongUserIds != null and belongUserIds.size() > 0">
        <if test="param.belongUserIds != null and param.belongUserIds.size() > 0">
            AND ts.belong_user_id in
            <foreach collection="belongUserIds" item="item" index="index" separator="," open="(" close=")">
            <foreach collection="param.belongUserIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
        </if>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java

@@ -77,7 +77,6 @@
                }
            }
        }

        List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId);
        return R.ok(mgtDeptStaffListVoList);
    }

			@@ -948,7 +948,11 @@
			List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
			// 获取店铺ids
			List<Long> data = shopService.getShopIdsByUserIds(userIds).getData();
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}
			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -956,7 +960,12 @@
			longs.add(sysUser.getUserId());
			// 获取店铺ids
			List<Long> data1 = shopService.getShopIdsByUserIds(longs).getData();
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}

			break;
			}
			}

			@@ -318,6 +318,7 @@
			<foreach collection="list" item="item" open="(" separator="," close=")">
			#{item}
			</foreach>
			AND tm.binding_flag = 1
			</if>
			ORDER BY tm.create_time DESC
			</select>

			@@ -93,7 +93,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -104,7 +109,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			@@ -135,7 +144,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -146,7 +160,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			@@ -412,7 +430,12 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}

			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -423,7 +446,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}
			@@ -490,7 +517,11 @@
			.in("belong_user_id", userIds)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data);
			if (data.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data);
			}
			break;
			case "5":
			// 仅个人数据查询当前登陆人关联店铺下的用户
			@@ -501,7 +532,11 @@
			.in("belong_user_id", longs)
			.eq("del_flag", 0))
			.stream().map(Shop::getShopId).collect(Collectors.toList());
			scope.addAll(data1);
			if (data1.size()==0){
			scope.add(0L);
			}else{
			scope.addAll(data1);
			}
			break;
			}
			}

			@@ -349,9 +349,9 @@
			<if test="param.recommendPerson!=null and param.recommendPerson!=''">
			AND ts.recommend_person = #{param.recommendPerson}
			</if>
			<if test="belongUserIds != null and belongUserIds.size() > 0">
			<if test="param.belongUserIds != null and param.belongUserIds.size() > 0">
			AND ts.belong_user_id in
			<foreach collection="belongUserIds" item="item" index="index" separator="," open="(" close=")">
			<foreach collection="param.belongUserIds" item="item" index="index" separator="," open="(" close=")">
			#{item}
			</foreach>
			</if>

			@@ -77,7 +77,6 @@
			}
			}
			}

			List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId);
			return R.ok(mgtDeptStaffListVoList);
			}