Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-03-07 d7fef91a4cbb702988dc820bcde82c166253ceec

 ard-inspection/src/main/java/com/ard/inspection/mapper/ArdInspectionGroupMapper.java

@@ -69,8 +69,10 @@
     * @param groupParentId 分组父部门ID
     * @return 结果
     */
    public ArdInspectionGroup checkInspectionGroupNameUnique(@Param("groupName") String groupName,
    public ArdInspectionGroup checkInspectionGroupNameUniqueA(@Param("groupName") String groupName,
                                                             @Param("groupParentId") Long groupParentId);

    public ArdInspectionGroup checkInspectionGroupNameUniqueB(@Param("groupName") String groupName);

    /**
     * 根据ID查询所有子分组
@@ -103,4 +105,12 @@
     * @return 结果 true 存在 false 不存在
     */
    public int checkInspectionGroupExistUser(Long groupId);

    /**
     * 查询groupId最大值
     *
     * @return 结果 true 存在 false 不存在
     */
    public int selectMaxGroupId();

}